diff options
| author | Melanie | 2013-03-23 23:01:55 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-23 23:01:55 +0000 |
| commit | 6ce9ed1a6422599f136f6f5d80e11324e32067c6 (patch) | |
| tree | 5d34e0dfd91b6397d97e5be9ce976621356b361f /doc | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Fix teleporting into the non-SW 256x256 corner of a megaregion, though curren... (diff) | |
| download | opensim-SC-6ce9ed1a6422599f136f6f5d80e11324e32067c6.zip opensim-SC-6ce9ed1a6422599f136f6f5d80e11324e32067c6.tar.gz opensim-SC-6ce9ed1a6422599f136f6f5d80e11324e32067c6.tar.bz2 opensim-SC-6ce9ed1a6422599f136f6f5d80e11324e32067c6.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions