diff options
| author | Melanie | 2013-01-02 11:52:37 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-02 11:52:37 +0000 |
| commit | 7943c8d11cbcac3ab16fb347d0c4116adc6437a5 (patch) | |
| tree | a8f099569905001bdedf144a77fd7b9191aa6427 /prebuild.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: add parameter to have Bullet output performance statistics (diff) | |
| download | opensim-SC_OLD-7943c8d11cbcac3ab16fb347d0c4116adc6437a5.zip opensim-SC_OLD-7943c8d11cbcac3ab16fb347d0c4116adc6437a5.tar.gz opensim-SC_OLD-7943c8d11cbcac3ab16fb347d0c4116adc6437a5.tar.bz2 opensim-SC_OLD-7943c8d11cbcac3ab16fb347d0c4116adc6437a5.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
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 40f387d..fa7f9e9 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -1870,6 +1870,7 @@ | |||
| 1870 | <Reference name="OpenSim.Framework.Console"/> | 1870 | <Reference name="OpenSim.Framework.Console"/> |
| 1871 | <Reference name="OpenSim.Region.Physics.Manager"/> | 1871 | <Reference name="OpenSim.Region.Physics.Manager"/> |
| 1872 | <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/> | 1872 | <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/> |
| 1873 | <Reference name="BulletXNA.dll" path="../../../../bin/"/> | ||
| 1873 | <Reference name="log4net.dll" path="../../../../bin/"/> | 1874 | <Reference name="log4net.dll" path="../../../../bin/"/> |
| 1874 | 1875 | ||
| 1875 | <Files> | 1876 | <Files> |