diff options
author | Robert Adams | 2013-12-20 06:52:28 -0800 |
---|---|---|
committer | Robert Adams | 2013-12-20 06:52:28 -0800 |
commit | a01862509ee3317dde34ffb5cdbaf98672b510c3 (patch) | |
tree | 335fe6b6be7e796b33f11f3e939605ba28af1df3 /prebuild.xml | |
parent | Merge branch 'master' into varregion (diff) | |
parent | Merge branch 'justincc-master' (diff) | |
download | opensim-SC_OLD-a01862509ee3317dde34ffb5cdbaf98672b510c3.zip opensim-SC_OLD-a01862509ee3317dde34ffb5cdbaf98672b510c3.tar.gz opensim-SC_OLD-a01862509ee3317dde34ffb5cdbaf98672b510c3.tar.bz2 opensim-SC_OLD-a01862509ee3317dde34ffb5cdbaf98672b510c3.tar.xz |
Merge branch 'master' into varregion
Diffstat (limited to 'prebuild.xml')
-rw-r--r-- | prebuild.xml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml index f6e0f4b..5b18195 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -2839,8 +2839,9 @@ | |||
2839 | <Reference name="OpenSim.Framework.Console"/> | 2839 | <Reference name="OpenSim.Framework.Console"/> |
2840 | <Reference name="OpenSim.Framework.Servers"/> | 2840 | <Reference name="OpenSim.Framework.Servers"/> |
2841 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 2841 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
2842 | <Reference name="OpenSim.Region.Framework"/> | ||
2843 | <Reference name="OpenSim.Region.CoreModules"/> | 2842 | <Reference name="OpenSim.Region.CoreModules"/> |
2843 | <Reference name="OpenSim.Region.ClientStack.LindenCaps"/> | ||
2844 | <Reference name="OpenSim.Region.Framework"/> | ||
2844 | <Reference name="OpenSim.Region.OptionalModules"/> | 2845 | <Reference name="OpenSim.Region.OptionalModules"/> |
2845 | <Reference name="OpenSim.Region.Physics.Manager"/> | 2846 | <Reference name="OpenSim.Region.Physics.Manager"/> |
2846 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> | 2847 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> |
@@ -3200,6 +3201,7 @@ | |||
3200 | <Reference name="System.Drawing"/> | 3201 | <Reference name="System.Drawing"/> |
3201 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 3202 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
3202 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 3203 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
3204 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
3203 | <Reference name="OpenSim.Data"/> | 3205 | <Reference name="OpenSim.Data"/> |
3204 | <Reference name="OpenSim.Framework"/> | 3206 | <Reference name="OpenSim.Framework"/> |
3205 | <Reference name="OpenSim.Framework.Serialization"/> | 3207 | <Reference name="OpenSim.Framework.Serialization"/> |
@@ -3208,6 +3210,7 @@ | |||
3208 | <Reference name="OpenSim.Framework.Monitoring"/> | 3210 | <Reference name="OpenSim.Framework.Monitoring"/> |
3209 | <Reference name="OpenSim.Framework.Servers"/> | 3211 | <Reference name="OpenSim.Framework.Servers"/> |
3210 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 3212 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
3213 | <Reference name="OpenSim.Region.ClientStack.LindenCaps"/> | ||
3211 | <Reference name="OpenSim.Region.Framework"/> | 3214 | <Reference name="OpenSim.Region.Framework"/> |
3212 | <Reference name="OpenSim.Region.CoreModules"/> | 3215 | <Reference name="OpenSim.Region.CoreModules"/> |
3213 | <Reference name="OpenSim.Region.OptionalModules"/> | 3216 | <Reference name="OpenSim.Region.OptionalModules"/> |