diff options
| author | Melanie | 2013-01-25 00:10:32 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-25 00:10:32 +0000 |
| commit | 0b8bf69470aa461ac8b6554dce5e56427f39ac74 (patch) | |
| tree | 9e2175c461425d1abc6ffbdb7d19278a9bf82c2e /OpenSim/Region/CoreModules/World/Objects | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: reduce the zeroing threshold for rotational velocity. (diff) | |
| download | opensim-SC_OLD-0b8bf69470aa461ac8b6554dce5e56427f39ac74.zip opensim-SC_OLD-0b8bf69470aa461ac8b6554dce5e56427f39ac74.tar.gz opensim-SC_OLD-0b8bf69470aa461ac8b6554dce5e56427f39ac74.tar.bz2 opensim-SC_OLD-0b8bf69470aa461ac8b6554dce5e56427f39ac74.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Objects')
0 files changed, 0 insertions, 0 deletions