diff options
| author | Melanie | 2012-11-30 01:19:08 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-30 01:19:08 +0000 |
| commit | daa1d99513546121592bcab64d2178a570cd250e (patch) | |
| tree | b45c14a2771cef6bfee8477aea2a84f6f25ed873 /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: fix boats floating low by removing LIMIT_MOTOR_UP flag from TYPE_B... (diff) | |
| download | opensim-SC-daa1d99513546121592bcab64d2178a570cd250e.zip opensim-SC-daa1d99513546121592bcab64d2178a570cd250e.tar.gz opensim-SC-daa1d99513546121592bcab64d2178a570cd250e.tar.bz2 opensim-SC-daa1d99513546121592bcab64d2178a570cd250e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
0 files changed, 0 insertions, 0 deletions