aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorBlueWall2012-12-07 15:36:43 -0500
committerBlueWall2012-12-07 15:36:43 -0500
commit0b455d2882a51ce0841d003f12d4c35ad9edb753 (patch)
treec48c95f48786f8fe435fc5c90477ac3b7c9eaf6c /prebuild.xml
parentMerge branch 'master' into connector_plugin (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.zip
opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.gz
opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.bz2
opensim-SC_OLD-0b455d2882a51ce0841d003f12d4c35ad9edb753.tar.xz
Merge branch 'master' into connector_plugin
Diffstat (limited to 'prebuild.xml')
-rw-r--r--prebuild.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/prebuild.xml b/prebuild.xml
index fffeab1..99ba2a9 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2052,7 +2052,7 @@
2052 <Reference name="OpenMetaverseTypes" path="../../../bin/"/> 2052 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
2053 <Reference name="OpenMetaverse" path="../../../bin/"/> 2053 <Reference name="OpenMetaverse" path="../../../bin/"/>
2054 <Reference name="Nini" path="../../../bin/"/> 2054 <Reference name="Nini" path="../../../bin/"/>
2055 <Reference name="Mono.Addins"/> 2055 <Reference name="Mono.Addins" path="../../../bin/"/>
2056 <Reference name="log4net" path="../../../bin/"/> 2056 <Reference name="log4net" path="../../../bin/"/>
2057 <Files> 2057 <Files>
2058 <Match pattern="*.cs" recurse="true"/> 2058 <Match pattern="*.cs" recurse="true"/>
@@ -2460,7 +2460,7 @@
2460 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 2460 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
2461 <Reference name="OpenSim.Region.Physics.Manager"/> 2461 <Reference name="OpenSim.Region.Physics.Manager"/>
2462 <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/> 2462 <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/>
2463 <Reference name="Mono.Addins"/> 2463 <Reference name="Mono.Addins" path="../../../bin/"/>
2464 2464
2465 <!-- For scripting in funny languages by default --> 2465 <!-- For scripting in funny languages by default -->
2466 <Reference name="XMLRPC" path="../../../bin/"/> 2466 <Reference name="XMLRPC" path="../../../bin/"/>