diff options
| author | Melanie | 2013-05-24 00:45:08 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-24 00:45:08 +0100 |
| commit | 09c2cd0d76e62cbc7bb2d8b0f21caae901af1681 (patch) | |
| tree | 1856552dd68bfa23877f28842cb00e9e0089d1c4 /prebuild.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: specify directory for OpenSim.Region.Physics.Meshing (diff) | |
| download | opensim-SC_OLD-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.zip opensim-SC_OLD-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.tar.gz opensim-SC_OLD-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.tar.bz2 opensim-SC_OLD-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.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 ef07bdc..c611cb9 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -1878,6 +1878,7 @@ | |||
| 1878 | <Reference name="OpenSim.Region.CoreModules"/> | 1878 | <Reference name="OpenSim.Region.CoreModules"/> |
| 1879 | <Reference name="OpenSim.Framework.Console"/> | 1879 | <Reference name="OpenSim.Framework.Console"/> |
| 1880 | <Reference name="OpenSim.Region.Physics.Manager"/> | 1880 | <Reference name="OpenSim.Region.Physics.Manager"/> |
| 1881 | <Reference name="OpenSim.Region.Physics.Meshing" path="../../../../bin/Physics/"/> | ||
| 1881 | <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/> | 1882 | <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/> |
| 1882 | <Reference name="BulletXNA.dll" path="../../../../bin/"/> | 1883 | <Reference name="BulletXNA.dll" path="../../../../bin/"/> |
| 1883 | <Reference name="log4net.dll" path="../../../../bin/"/> | 1884 | <Reference name="log4net.dll" path="../../../../bin/"/> |