diff options
author | Diva Canto | 2013-05-28 20:59:54 -0700 |
---|---|---|
committer | Diva Canto | 2013-05-28 20:59:54 -0700 |
commit | 233b9ec4d7739f324360366079469f2026c4ce41 (patch) | |
tree | 61266ac4ceffef23a74bad1dbd15bbe4fd103f82 /prebuild.xml | |
parent | First change in Vivox for ages! -- added a lock to serialize calls to vivox s... (diff) | |
parent | BulletSim: don't zero motion when changing vehicle type. (diff) | |
download | opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.zip opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.tar.gz opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.tar.bz2 opensim-SC-233b9ec4d7739f324360366079469f2026c4ce41.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | prebuild.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 9fbe08b..25c287e 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1753,6 +1753,7 @@ | |||
1753 | <Reference name="OpenSim.Region.CoreModules"/> | 1753 | <Reference name="OpenSim.Region.CoreModules"/> |
1754 | <Reference name="OpenSim.Framework.Console"/> | 1754 | <Reference name="OpenSim.Framework.Console"/> |
1755 | <Reference name="OpenSim.Region.Physics.Manager"/> | 1755 | <Reference name="OpenSim.Region.Physics.Manager"/> |
1756 | <Reference name="OpenSim.Region.Physics.Meshing" path="../../../../bin/Physics/"/> | ||
1756 | <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/> | 1757 | <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/> |
1757 | <Reference name="BulletXNA.dll" path="../../../../bin/"/> | 1758 | <Reference name="BulletXNA.dll" path="../../../../bin/"/> |
1758 | <Reference name="log4net.dll" path="../../../../bin/"/> | 1759 | <Reference name="log4net.dll" path="../../../../bin/"/> |