aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorRobert Adams2014-09-05 21:20:02 -0700
committerRobert Adams2014-09-05 21:20:02 -0700
commite5b269e9a09441814a2849e4411ab5b0e11c46df (patch)
tree0d25eaf07841eaefc3f9b1de5b434d3cbbac6f73 /prebuild.xml
parentMerge branch 'master' into bullet-2.82 (diff)
parentFor monitoring purposes, start non-timeout tasks (which do not currently use ... (diff)
downloadopensim-SC_OLD-e5b269e9a09441814a2849e4411ab5b0e11c46df.zip
opensim-SC_OLD-e5b269e9a09441814a2849e4411ab5b0e11c46df.tar.gz
opensim-SC_OLD-e5b269e9a09441814a2849e4411ab5b0e11c46df.tar.bz2
opensim-SC_OLD-e5b269e9a09441814a2849e4411ab5b0e11c46df.tar.xz
Merge branch 'master' into bullet-2.82
Diffstat (limited to 'prebuild.xml')
-rw-r--r--prebuild.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml
index ba18a2c..a10d824 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2489,6 +2489,7 @@
2489 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> 2489 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
2490 2490
2491 <Reference name="OpenSim.Framework"/> 2491 <Reference name="OpenSim.Framework"/>
2492 <Reference name="OpenSim.Framework.Monitoring"/>
2492 <Reference name="OpenSim.Data"/> 2493 <Reference name="OpenSim.Data"/>
2493 <Reference name="OpenSim.Framework.Servers"/> 2494 <Reference name="OpenSim.Framework.Servers"/>
2494 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 2495 <Reference name="OpenSim.Framework.Servers.HttpServer"/>