diff options
| author | Melanie | 2012-02-04 11:48:20 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-04 11:48:20 +0000 |
| commit | ce5e900721cb0447f76bcb198faf5f7c31eeaf6e (patch) | |
| tree | c906a2b8858f9c590e39e2a26f47017fd7b6b9c6 /prebuild.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add default value to TelehubObject (diff) | |
| download | opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.zip opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.tar.gz opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.tar.bz2 opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index aab61ad..20aa24f 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -218,6 +218,7 @@ | |||
| 218 | 218 | ||
| 219 | <ReferencePath>../../../bin/</ReferencePath> | 219 | <ReferencePath>../../../bin/</ReferencePath> |
| 220 | <Reference name="System"/> | 220 | <Reference name="System"/> |
| 221 | <Reference name="System.Core"/> | ||
| 221 | <Reference name="System.Xml"/> | 222 | <Reference name="System.Xml"/> |
| 222 | <Reference name="log4net" path="../../../bin/"/> | 223 | <Reference name="log4net" path="../../../bin/"/> |
| 223 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 224 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
| @@ -797,6 +798,7 @@ | |||
| 797 | <Reference name="OpenSim.Framework.Communications"/> | 798 | <Reference name="OpenSim.Framework.Communications"/> |
| 798 | <Reference name="OpenSim.Data"/> | 799 | <Reference name="OpenSim.Data"/> |
| 799 | <Reference name="OpenSim.Framework.Console"/> | 800 | <Reference name="OpenSim.Framework.Console"/> |
| 801 | <Reference name="OpenSim.Framework.Serialization"/> | ||
| 800 | <Reference name="OpenSim.Framework.Servers"/> | 802 | <Reference name="OpenSim.Framework.Servers"/> |
| 801 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 803 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
| 802 | <Reference name="OpenSim.Framework.Statistics"/> | 804 | <Reference name="OpenSim.Framework.Statistics"/> |