diff options
| author | Melanie | 2013-05-04 01:22:12 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-04 01:22:12 +0100 |
| commit | 3aa83738e2a845d05bb25ab81634d0540971c0bf (patch) | |
| tree | 411d946b817b020c72f3d9a35926215e28bf2d95 /CONTRIBUTORS.txt | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' into bulletsim4 (diff) | |
| download | opensim-SC_OLD-3aa83738e2a845d05bb25ab81634d0540971c0bf.zip opensim-SC_OLD-3aa83738e2a845d05bb25ab81634d0540971c0bf.tar.gz opensim-SC_OLD-3aa83738e2a845d05bb25ab81634d0540971c0bf.tar.bz2 opensim-SC_OLD-3aa83738e2a845d05bb25ab81634d0540971c0bf.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
Diffstat (limited to 'CONTRIBUTORS.txt')
0 files changed, 0 insertions, 0 deletions