diff options
| author | Justin Clark-Casey (justincc) | 2012-02-08 22:21:15 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-02-08 22:21:15 +0000 |
| commit | 3fa61c4a3924e35720e8ed20b6cc37cf1d13eb00 (patch) | |
| tree | 00deeb1c034f5fe039795d741ae4d56871d31c21 | |
| parent | Stop a scene object from attempting to link with itself (which results in an ... (diff) | |
| parent | Add missing reference to prebuild.xml for torture tests (diff) | |
| download | opensim-SC-3fa61c4a3924e35720e8ed20b6cc37cf1d13eb00.zip opensim-SC-3fa61c4a3924e35720e8ed20b6cc37cf1d13eb00.tar.gz opensim-SC-3fa61c4a3924e35720e8ed20b6cc37cf1d13eb00.tar.bz2 opensim-SC-3fa61c4a3924e35720e8ed20b6cc37cf1d13eb00.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
| -rw-r--r-- | prebuild.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 23a5a3b..1bf4972 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -3288,6 +3288,7 @@ | |||
| 3288 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 3288 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
| 3289 | <Reference name="OpenSim.Region.CoreModules"/> | 3289 | <Reference name="OpenSim.Region.CoreModules"/> |
| 3290 | <Reference name="OpenSim.Region.Framework"/> | 3290 | <Reference name="OpenSim.Region.Framework"/> |
| 3291 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> | ||
| 3291 | <Reference name="OpenSim.Region.ScriptEngine.XEngine"/> | 3292 | <Reference name="OpenSim.Region.ScriptEngine.XEngine"/> |
| 3292 | <Reference name="OpenSim.Tests.Common"/> | 3293 | <Reference name="OpenSim.Tests.Common"/> |
| 3293 | <Files> | 3294 | <Files> |