diff options
| author | UbitUmarov | 2017-04-25 17:59:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-04-25 17:59:53 +0100 |
| commit | a680d8b8d700f78beb1a9eea98b52d59118efe2e (patch) | |
| tree | dd084e74fb61400c704a14dcfa8689670acb9ec2 /prebuild.xml | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | move mesh pbs creation code out of mesh upload code into to PrimitiveBaseShap... (diff) | |
| download | opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.zip opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.gz opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.bz2 opensim-SC-a680d8b8d700f78beb1a9eea98b52d59118efe2e.tar.xz | |
fix merge
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 cb39e18..c087def 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -497,6 +497,7 @@ | |||
| 497 | <Reference name="OpenSim.Framework.Monitoring"/> | 497 | <Reference name="OpenSim.Framework.Monitoring"/> |
| 498 | <Reference name="OpenSim.Framework.Servers"/> | 498 | <Reference name="OpenSim.Framework.Servers"/> |
| 499 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 499 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
| 500 | <Reference name="Mono.Posix" path="../../../bin/"/> | ||
| 500 | <Reference name="Nini" path="../../../bin/"/> | 501 | <Reference name="Nini" path="../../../bin/"/> |
| 501 | <Reference name="log4net" path="../../../bin/"/> | 502 | <Reference name="log4net" path="../../../bin/"/> |
| 502 | 503 | ||
| @@ -1464,6 +1465,7 @@ | |||
| 1464 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | 1465 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> |
| 1465 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 1466 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
| 1466 | <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/> | 1467 | <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/> |
| 1468 | <Reference name="netcd" path="../../../bin/"/> | ||
| 1467 | <Reference name="OpenSim.Capabilities"/> | 1469 | <Reference name="OpenSim.Capabilities"/> |
| 1468 | <Reference name="OpenSim.Framework"/> | 1470 | <Reference name="OpenSim.Framework"/> |
| 1469 | <Reference name="OpenSim.Data"/> | 1471 | <Reference name="OpenSim.Data"/> |