aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorMelanie2013-01-16 16:52:57 +0000
committerMelanie2013-01-16 16:52:57 +0000
commit9c99ed26ebe7cd2e42c10487e4ddfde0c934d921 (patch)
tree536b2d6530fdda925203afddd27a4b9444e4d2a7 /prebuild.xml
parentComplete removal of the now unused state queue (diff)
parentChanged a couple of debug messages at the request of osgrid. (diff)
downloadopensim-SC_OLD-9c99ed26ebe7cd2e42c10487e4ddfde0c934d921.zip
opensim-SC_OLD-9c99ed26ebe7cd2e42c10487e4ddfde0c934d921.tar.gz
opensim-SC_OLD-9c99ed26ebe7cd2e42c10487e4ddfde0c934d921.tar.bz2
opensim-SC_OLD-9c99ed26ebe7cd2e42c10487e4ddfde0c934d921.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'prebuild.xml')
-rw-r--r--prebuild.xml6
1 files changed, 5 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml
index 4c18aa8..abf8f36 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2417,7 +2417,9 @@
2417 <Reference name="log4net" path="../../../../../bin/"/> 2417 <Reference name="log4net" path="../../../../../bin/"/>
2418 2418
2419 <Files> 2419 <Files>
2420 <Match pattern="*.cs" recurse="true"/> 2420 <Match pattern="*.cs" recurse="true">
2421 <Exclude name="Tests" pattern="Tests"/>
2422 </Match>
2421 </Files> 2423 </Files>
2422 </Project> 2424 </Project>
2423 2425
@@ -3285,6 +3287,7 @@
3285 <Reference name="OpenSim.Region.ScriptEngine.Shared"/> 3287 <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
3286 <Reference name="OpenSim.Region.ScriptEngine.Shared.Api"/> 3288 <Reference name="OpenSim.Region.ScriptEngine.Shared.Api"/>
3287 <Reference name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime"/> 3289 <Reference name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime"/>
3290 <Reference name="OpenSim.Region.ScriptEngine.Shared.Instance"/>
3288 <Reference name="OpenSim.Region.ScriptEngine.XEngine"/> 3291 <Reference name="OpenSim.Region.ScriptEngine.XEngine"/>
3289 <Reference name="OpenSim.Services.Interfaces"/> 3292 <Reference name="OpenSim.Services.Interfaces"/>
3290 <Reference name="OpenSim.Tests.Common"/> 3293 <Reference name="OpenSim.Tests.Common"/>
@@ -3308,6 +3311,7 @@
3308 <!-- SADLY the way this works means you need to keep adding these paths --> 3311 <!-- SADLY the way this works means you need to keep adding these paths -->
3309 <Match path="Shared/Tests" pattern="*.cs" recurse="true"/> 3312 <Match path="Shared/Tests" pattern="*.cs" recurse="true"/>
3310 <Match path="Shared/CodeTools/Tests" pattern="*.cs" recurse="true"/> 3313 <Match path="Shared/CodeTools/Tests" pattern="*.cs" recurse="true"/>
3314 <Match path="Shared/Instance/Tests" pattern="*.cs" recurse="true"/>
3311 <Match path="XEngine/Tests" pattern="*.cs" recurse="true"/> 3315 <Match path="XEngine/Tests" pattern="*.cs" recurse="true"/>
3312 </Files> 3316 </Files>
3313 </Project> 3317 </Project>