diff options
| author | Melanie | 2012-04-03 23:52:53 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-03 23:52:53 +0100 |
| commit | 63c44719f7a67950325690bc4cc848b75318e29f (patch) | |
| tree | eaa0575671680d8dad75813dc8700d098a3df622 /prebuild.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | terrain save-tile extensions Signed-off-by: Garmin Kawaguichi <garmin.kawagui... (diff) | |
| download | opensim-SC_OLD-63c44719f7a67950325690bc4cc848b75318e29f.zip opensim-SC_OLD-63c44719f7a67950325690bc4cc848b75318e29f.tar.gz opensim-SC_OLD-63c44719f7a67950325690bc4cc848b75318e29f.tar.bz2 opensim-SC_OLD-63c44719f7a67950325690bc4cc848b75318e29f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml index 2f114da..f9b26ef 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -1550,7 +1550,7 @@ | |||
| 1550 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | 1550 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> |
| 1551 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 1551 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
| 1552 | <Reference name="CSJ2K" path="../../../bin/"/> | 1552 | <Reference name="CSJ2K" path="../../../bin/"/> |
| 1553 | <Reference name="Warp3D" path="../../../bin/" localCopy="true"/> | 1553 | <Reference name="Warp3D" path="../../../bin/"/> |
| 1554 | <Reference name="OpenSim.Capabilities"/> | 1554 | <Reference name="OpenSim.Capabilities"/> |
| 1555 | <Reference name="OpenSim.Data"/> | 1555 | <Reference name="OpenSim.Data"/> |
| 1556 | <Reference name="OpenSim.Framework"/> | 1556 | <Reference name="OpenSim.Framework"/> |