diff options
| author | Melanie | 2013-02-07 20:51:51 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-07 20:51:51 +0000 |
| commit | 45f5a6a6db16538d864ff90ab6952aea13007514 (patch) | |
| tree | 48583f7c77afd88a4760ea9db9159741f659fe5b /prebuild.xml | |
| parent | Rename Bounciness to Restitution (diff) | |
| parent | Change passed PhysicsParameter value from float to the more general string value (diff) | |
| download | opensim-SC_OLD-45f5a6a6db16538d864ff90ab6952aea13007514.zip opensim-SC_OLD-45f5a6a6db16538d864ff90ab6952aea13007514.tar.gz opensim-SC_OLD-45f5a6a6db16538d864ff90ab6952aea13007514.tar.bz2 opensim-SC_OLD-45f5a6a6db16538d864ff90ab6952aea13007514.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
bin/HttpServer_OpenSim.dll
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 0a4c914..51a4e8b 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -1587,6 +1587,8 @@ | |||
| 1587 | </Files> | 1587 | </Files> |
| 1588 | </Project> | 1588 | </Project> |
| 1589 | 1589 | ||
| 1590 | |||
| 1591 | |||
| 1590 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenCaps" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library"> | 1592 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenCaps" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library"> |
| 1591 | <Configuration name="Debug"> | 1593 | <Configuration name="Debug"> |
| 1592 | <Options> | 1594 | <Options> |
| @@ -1631,6 +1633,7 @@ | |||
| 1631 | </Files> | 1633 | </Files> |
| 1632 | </Project> | 1634 | </Project> |
| 1633 | 1635 | ||
| 1636 | |||
| 1634 | <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library"> | 1637 | <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library"> |
| 1635 | <Configuration name="Debug"> | 1638 | <Configuration name="Debug"> |
| 1636 | <Options> | 1639 | <Options> |