diff options
author | Diva Canto | 2014-02-21 10:05:06 -0800 |
---|---|---|
committer | Diva Canto | 2014-02-21 10:05:06 -0800 |
commit | 97c74afca897acf8f000b0560ff041fd51897e5b (patch) | |
tree | 71efc4ababc6f428de291a56e289fa158cbf2272 /prebuild.xml | |
parent | Added 2 new behavirors to pCampBot. These are part of a systematic study I'm ... (diff) | |
parent | If texture decode fails in Warp3D map maker, log uuid of asset that failed to... (diff) | |
download | opensim-SC_OLD-97c74afca897acf8f000b0560ff041fd51897e5b.zip opensim-SC_OLD-97c74afca897acf8f000b0560ff041fd51897e5b.tar.gz opensim-SC_OLD-97c74afca897acf8f000b0560ff041fd51897e5b.tar.bz2 opensim-SC_OLD-97c74afca897acf8f000b0560ff041fd51897e5b.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'prebuild.xml')
-rw-r--r-- | prebuild.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 5b18195..dfb30dc 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -3325,6 +3325,7 @@ | |||
3325 | <Reference name="nunit.framework" path="../../../../../bin/"/> | 3325 | <Reference name="nunit.framework" path="../../../../../bin/"/> |
3326 | <Reference name="OpenMetaverse" path="../../../../../bin/"/> | 3326 | <Reference name="OpenMetaverse" path="../../../../../bin/"/> |
3327 | <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/> | 3327 | <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/> |
3328 | <Reference name="OpenMetaverse.StructuredData" path="../../../../../bin/"/> | ||
3328 | <Reference name="OpenSim.Framework"/> | 3329 | <Reference name="OpenSim.Framework"/> |
3329 | <Reference name="OpenSim.Framework.Communications"/> | 3330 | <Reference name="OpenSim.Framework.Communications"/> |
3330 | <Reference name="OpenSim.Framework.Monitoring"/> | 3331 | <Reference name="OpenSim.Framework.Monitoring"/> |
@@ -3334,6 +3335,7 @@ | |||
3334 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> | 3335 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> |
3335 | <Reference name="OpenSim.Region.CoreModules"/> | 3336 | <Reference name="OpenSim.Region.CoreModules"/> |
3336 | <Reference name="OpenSim.Region.Framework"/> | 3337 | <Reference name="OpenSim.Region.Framework"/> |
3338 | <Reference name="OpenSim.Region.OptionalModules"/> | ||
3337 | <Reference name="OpenSim.Services.Interfaces"/> | 3339 | <Reference name="OpenSim.Services.Interfaces"/> |
3338 | <Reference name="OpenSim.Tests.Common"/> | 3340 | <Reference name="OpenSim.Tests.Common"/> |
3339 | 3341 | ||