diff options
| author | Melanie | 2012-12-18 09:44:10 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-18 09:44:10 +0000 |
| commit | b9939a46a19af74f79a492e3b9fb3f65d0de31cd (patch) | |
| tree | b20ee4582458689096ff58770397c766c4ac36a8 /OpenSim/Framework/NetworkServersInfo.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: fix vehicles being shot in the air at border crossings because of ... (diff) | |
| download | opensim-SC-b9939a46a19af74f79a492e3b9fb3f65d0de31cd.zip opensim-SC-b9939a46a19af74f79a492e3b9fb3f65d0de31cd.tar.gz opensim-SC-b9939a46a19af74f79a492e3b9fb3f65d0de31cd.tar.bz2 opensim-SC-b9939a46a19af74f79a492e3b9fb3f65d0de31cd.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Framework/NetworkServersInfo.cs')
0 files changed, 0 insertions, 0 deletions