diff options
| author | Jonathan Freedman | 2010-11-21 19:51:23 -0800 |
|---|---|---|
| committer | Jonathan Freedman | 2010-11-21 19:51:23 -0800 |
| commit | 562147475cc24a18da2b812a69ce2330c7633cf6 (patch) | |
| tree | 1168b5591f615442f8a09fd9776209d0923c2b3d /prebuild.xml | |
| parent | Merge git://github.com/opensim/opensim into mantis5110 (diff) | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| download | opensim-SC-562147475cc24a18da2b812a69ce2330c7633cf6.zip opensim-SC-562147475cc24a18da2b812a69ce2330c7633cf6.tar.gz opensim-SC-562147475cc24a18da2b812a69ce2330c7633cf6.tar.bz2 opensim-SC-562147475cc24a18da2b812a69ce2330c7633cf6.tar.xz | |
Merge https://github.com/opensim/opensim into mantis5110
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/prebuild.xml b/prebuild.xml index c6eb65a..e77d5c1 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -2155,7 +2155,7 @@ | |||
| 2155 | <Reference name="OpenSim.Region.Framework"/> | 2155 | <Reference name="OpenSim.Region.Framework"/> |
| 2156 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 2156 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
| 2157 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 2157 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
| 2158 | <Reference name="Mono.Data.SqliteClient"/> | 2158 | <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/> |
| 2159 | <Reference name="Mono.Addins" path="../../../bin/"/> | 2159 | <Reference name="Mono.Addins" path="../../../bin/"/> |
| 2160 | <Reference name="log4net" path="../../../bin/"/> | 2160 | <Reference name="log4net" path="../../../bin/"/> |
| 2161 | 2161 | ||
| @@ -2503,7 +2503,7 @@ | |||
| 2503 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 2503 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
| 2504 | <Reference name="OpenSim.Framework.Statistics"/> | 2504 | <Reference name="OpenSim.Framework.Statistics"/> |
| 2505 | <Reference name="OpenSim.Region.Physics.Manager"/> | 2505 | <Reference name="OpenSim.Region.Physics.Manager"/> |
| 2506 | <Reference name="Mono.Data.SqliteClient"/> | 2506 | <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/> |
| 2507 | <Reference name="Mono.Addins"/> | 2507 | <Reference name="Mono.Addins"/> |
| 2508 | 2508 | ||
| 2509 | <!-- For scripting in funny languages by default --> | 2509 | <!-- For scripting in funny languages by default --> |