aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorMelanie2011-03-27 21:22:31 +0100
committerMelanie2011-03-27 21:22:31 +0100
commitf25749f0259bdfe334f77ab049ac5f892135bbc6 (patch)
tree5fd38027cbe794a1da1d87009f9975d3792f085a /prebuild.xml
parentDon't send a windlight profile to clients if windlight is not set for (diff)
parentAdd SignpostMarv to contributors (diff)
downloadopensim-SC_OLD-f25749f0259bdfe334f77ab049ac5f892135bbc6.zip
opensim-SC_OLD-f25749f0259bdfe334f77ab049ac5f892135bbc6.tar.gz
opensim-SC_OLD-f25749f0259bdfe334f77ab049ac5f892135bbc6.tar.bz2
opensim-SC_OLD-f25749f0259bdfe334f77ab049ac5f892135bbc6.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'prebuild.xml')
-rw-r--r--prebuild.xml7
1 files changed, 5 insertions, 2 deletions
diff --git a/prebuild.xml b/prebuild.xml
index b31812d..c818908 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -402,6 +402,7 @@
402 <Reference name="System"/> 402 <Reference name="System"/>
403 <Reference name="System.Xml"/> 403 <Reference name="System.Xml"/>
404 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> 404 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
405 <Reference name="log4net" path="../../../../bin/"/>
405 <Reference name="XMLRPC" path="../../../../bin/"/> 406 <Reference name="XMLRPC" path="../../../../bin/"/>
406 <Reference name="OpenSim.Framework"/> 407 <Reference name="OpenSim.Framework"/>
407 <Reference name="OpenSim.Framework.Console"/> 408 <Reference name="OpenSim.Framework.Console"/>
@@ -1058,6 +1059,7 @@
1058 <Reference name="OpenSim.Framework"/> 1059 <Reference name="OpenSim.Framework"/>
1059 <Reference name="OpenSim.Framework.Console"/> 1060 <Reference name="OpenSim.Framework.Console"/>
1060 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 1061 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1062 <Reference name="OpenSim.Server.Base"/>
1061 <Reference name="OpenSim.Services.Interfaces"/> 1063 <Reference name="OpenSim.Services.Interfaces"/>
1062 <Reference name="OpenSim.Services.Base"/> 1064 <Reference name="OpenSim.Services.Base"/>
1063 <Reference name="OpenSim.Services.Connectors"/> 1065 <Reference name="OpenSim.Services.Connectors"/>
@@ -2156,8 +2158,8 @@
2156 <Reference name="OpenMetaverseTypes" path="../../../bin/"/> 2158 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
2157 <Reference name="OpenMetaverse" path="../../../bin/"/> 2159 <Reference name="OpenMetaverse" path="../../../bin/"/>
2158 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> 2160 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
2159 <Reference name="Community.CsharpSqlite"/> 2161 <Reference name="Community.CsharpSqlite" path="../../../bin/"/>
2160 <Reference name="Community.CsharpSqlite.Sqlite"/> 2162 <Reference name="Community.CsharpSqlite.Sqlite" path="../../../bin"/>
2161 <Reference name="Mono.Data.Sqlite"/> 2163 <Reference name="Mono.Data.Sqlite"/>
2162 <Reference name="Mono.Addins" path="../../../bin/"/> 2164 <Reference name="Mono.Addins" path="../../../bin/"/>
2163 <Reference name="log4net" path="../../../bin/"/> 2165 <Reference name="log4net" path="../../../bin/"/>
@@ -2927,6 +2929,7 @@
2927 <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/> 2929 <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/>
2928 <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/> 2930 <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/>
2929 <Match buildAction="EmbeddedResource" path="World/Archiver/Tests/Resources" pattern="*"/> 2931 <Match buildAction="EmbeddedResource" path="World/Archiver/Tests/Resources" pattern="*"/>
2932 <Match path="World/Land/Tests" pattern="*.cs" recurse="true"/>
2930 <Match path="World/Media/Moap/Tests" pattern="*.cs" recurse="true"/> 2933 <Match path="World/Media/Moap/Tests" pattern="*.cs" recurse="true"/>
2931 <Match path="World/Serialiser/Tests" pattern="*.cs" recurse="true"/> 2934 <Match path="World/Serialiser/Tests" pattern="*.cs" recurse="true"/>
2932 <Match path="World/Terrain/Tests" pattern="*.cs" recurse="true"/> 2935 <Match path="World/Terrain/Tests" pattern="*.cs" recurse="true"/>