diff options
| author | Melanie | 2012-08-01 23:03:03 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-01 23:03:03 +0100 |
| commit | ecffcf7f65151a45b6396354d66fec70a7f3bad8 (patch) | |
| tree | c2b98c522344cf713421b21ddb4452e537396f5a /bin/OpenSim.Services.exe.config | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-ecffcf7f65151a45b6396354d66fec70a7f3bad8.zip opensim-SC-ecffcf7f65151a45b6396354d66fec70a7f3bad8.tar.gz opensim-SC-ecffcf7f65151a45b6396354d66fec70a7f3bad8.tar.bz2 opensim-SC-ecffcf7f65151a45b6396354d66fec70a7f3bad8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Physics/Manager/PhysicsScene.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions