diff options
| author | Melanie | 2012-02-19 20:17:47 +0100 |
|---|---|---|
| committer | Melanie | 2012-02-19 20:17:47 +0100 |
| commit | d6f212059e260c497502c8d59762c389a4973706 (patch) | |
| tree | 8a335cfd25bad8e19be60de8791a07620beb520a | |
| parent | Merge branch 'ubitwork' (diff) | |
| download | opensim-SC-d6f212059e260c497502c8d59762c389a4973706.zip opensim-SC-d6f212059e260c497502c8d59762c389a4973706.tar.gz opensim-SC-d6f212059e260c497502c8d59762c389a4973706.tar.bz2 opensim-SC-d6f212059e260c497502c8d59762c389a4973706.tar.xz | |
Fix merge issues in prebuild
| -rw-r--r-- | prebuild.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml index 443c4f8..783bcb4 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -3346,12 +3346,16 @@ | |||
| 3346 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | 3346 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> |
| 3347 | <Reference name="XMLRPC" path="../../../bin/"/> | 3347 | <Reference name="XMLRPC" path="../../../bin/"/> |
| 3348 | <Reference name="OpenSim.Framework"/> | 3348 | <Reference name="OpenSim.Framework"/> |
| 3349 | <Reference name="OpenSim.Framework.Communications"/> | ||
| 3349 | <Reference name="OpenSim.Framework.Console"/> | 3350 | <Reference name="OpenSim.Framework.Console"/> |
| 3350 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 3351 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
| 3351 | <Reference name="OpenSim.Region.CoreModules"/> | 3352 | <Reference name="OpenSim.Region.CoreModules"/> |
| 3352 | <Reference name="OpenSim.Region.Framework"/> | 3353 | <Reference name="OpenSim.Region.Framework"/> |
| 3353 | <Reference name="OpenSim.Region.ScriptEngine.XEngine"/> | 3354 | <Reference name="OpenSim.Region.OptionalModules"/> |
| 3354 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> | 3355 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> |
| 3356 | <Reference name="OpenSim.Region.ScriptEngine.XEngine"/> | ||
| 3357 | <Reference name="OpenSim.Services.Interfaces"/> | ||
| 3358 | <Reference name="OpenSim.Services.AvatarService"/> | ||
| 3355 | <Reference name="OpenSim.Tests.Common"/> | 3359 | <Reference name="OpenSim.Tests.Common"/> |
| 3356 | <Files> | 3360 | <Files> |
| 3357 | <Match pattern="*.cs" recurse="false"/> | 3361 | <Match pattern="*.cs" recurse="false"/> |