diff options
| author | Melanie | 2012-02-09 00:19:37 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-09 00:19:37 +0000 |
| commit | 7c888f6af11b5f1d2e41add5ecadae4aa4b2dfa1 (patch) | |
| tree | 14c6090f09e2d6bd400fbdaa2fe16299323f63a9 /prebuild.xml | |
| parent | Push more NPC stuff into threads (diff) | |
| parent | minor: put in commented out logging statements for future reuse (diff) | |
| download | opensim-SC-7c888f6af11b5f1d2e41add5ecadae4aa4b2dfa1.zip opensim-SC-7c888f6af11b5f1d2e41add5ecadae4aa4b2dfa1.tar.gz opensim-SC-7c888f6af11b5f1d2e41add5ecadae4aa4b2dfa1.tar.bz2 opensim-SC-7c888f6af11b5f1d2e41add5ecadae4aa4b2dfa1.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 7f069bd..0454e24 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -3320,6 +3320,7 @@ | |||
| 3320 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 3320 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
| 3321 | <Reference name="OpenSim.Region.CoreModules"/> | 3321 | <Reference name="OpenSim.Region.CoreModules"/> |
| 3322 | <Reference name="OpenSim.Region.Framework"/> | 3322 | <Reference name="OpenSim.Region.Framework"/> |
| 3323 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> | ||
| 3323 | <Reference name="OpenSim.Region.ScriptEngine.XEngine"/> | 3324 | <Reference name="OpenSim.Region.ScriptEngine.XEngine"/> |
| 3324 | <Reference name="OpenSim.Tests.Common"/> | 3325 | <Reference name="OpenSim.Tests.Common"/> |
| 3325 | <Files> | 3326 | <Files> |