diff options
| author | Melanie | 2012-04-27 17:09:49 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-27 17:09:49 +0100 |
| commit | 90305001de2dc043fa76760367ac22de0056686a (patch) | |
| tree | ad8d39d2064d4a6b07d03b55d6cfd0dbe3d3d8f5 /prebuild.xml | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | Add regression test for teleporting an agent between separated regions on the... (diff) | |
| download | opensim-SC-90305001de2dc043fa76760367ac22de0056686a.zip opensim-SC-90305001de2dc043fa76760367ac22de0056686a.tar.gz opensim-SC-90305001de2dc043fa76760367ac22de0056686a.tar.bz2 opensim-SC-90305001de2dc043fa76760367ac22de0056686a.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'prebuild.xml')
0 files changed, 0 insertions, 0 deletions