diff options
| author | Melanie | 2012-12-30 03:43:51 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-30 03:43:51 +0000 |
| commit | 7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5 (patch) | |
| tree | e2b5b94a95511a6e26c56b611e7b7445c28d119f /OpenSim/Region/ScriptEngine/Shared/Properties | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: remove check for small motor movement because, while it (diff) | |
| download | opensim-SC-7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5.zip opensim-SC-7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5.tar.gz opensim-SC-7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5.tar.bz2 opensim-SC-7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Properties')
0 files changed, 0 insertions, 0 deletions