aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorJonathan Freedman2010-10-03 18:04:38 -0400
committerJonathan Freedman2010-10-03 18:04:38 -0400
commite3099d48f9ebfaa7b1feede2d6f2788bdc93552b (patch)
tree4bddd7ea4e3d4671c9c4956fc7f6105219d88338 /prebuild.xml
parent* additional serveruri cleanup (diff)
parentUpgraded Mono.Addins.dll to 0.5, coming from here: http://monoaddins.codeplex... (diff)
downloadopensim-SC_OLD-e3099d48f9ebfaa7b1feede2d6f2788bdc93552b.zip
opensim-SC_OLD-e3099d48f9ebfaa7b1feede2d6f2788bdc93552b.tar.gz
opensim-SC_OLD-e3099d48f9ebfaa7b1feede2d6f2788bdc93552b.tar.bz2
opensim-SC_OLD-e3099d48f9ebfaa7b1feede2d6f2788bdc93552b.tar.xz
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'prebuild.xml')
-rw-r--r--prebuild.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml
index 530c417..5746890 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1370,11 +1370,13 @@
1370 <Configuration name="Debug"> 1370 <Configuration name="Debug">
1371 <Options> 1371 <Options>
1372 <OutputPath>../../../bin/</OutputPath> 1372 <OutputPath>../../../bin/</OutputPath>
1373 <AllowUnsafe>true</AllowUnsafe>
1373 </Options> 1374 </Options>
1374 </Configuration> 1375 </Configuration>
1375 <Configuration name="Release"> 1376 <Configuration name="Release">
1376 <Options> 1377 <Options>
1377 <OutputPath>../../../bin/</OutputPath> 1378 <OutputPath>../../../bin/</OutputPath>
1379 <AllowUnsafe>true</AllowUnsafe>
1378 </Options> 1380 </Options>
1379 </Configuration> 1381 </Configuration>
1380 1382
@@ -1389,6 +1391,7 @@
1389 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> 1391 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
1390 <Reference name="OpenMetaverse" path="../../../bin/"/> 1392 <Reference name="OpenMetaverse" path="../../../bin/"/>
1391 <Reference name="CSJ2K" path="../../../bin/"/> 1393 <Reference name="CSJ2K" path="../../../bin/"/>
1394 <Reference name="Warp3D" path="../../../bin/" localCopy="true"/>
1392 <Reference name="OpenSim.Framework"/> 1395 <Reference name="OpenSim.Framework"/>
1393 <Reference name="OpenSim.Framework.Capabilities"/> 1396 <Reference name="OpenSim.Framework.Capabilities"/>
1394 <Reference name="OpenSim.Framework.Communications"/> 1397 <Reference name="OpenSim.Framework.Communications"/>