diff options
author | Melanie | 2012-03-07 00:51:59 +0000 |
---|---|---|
committer | Melanie | 2012-03-07 00:51:59 +0000 |
commit | caa19862fa9a26bc5ee53e220565f99fc4084f33 (patch) | |
tree | 6b7629a4156c9c9865c08c45108c46b805fa6239 /LICENSE.txt | |
parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
parent | Stop individually deleting objects at the end of each ObjectTortureTest. (diff) | |
download | opensim-SC-caa19862fa9a26bc5ee53e220565f99fc4084f33.zip opensim-SC-caa19862fa9a26bc5ee53e220565f99fc4084f33.tar.gz opensim-SC-caa19862fa9a26bc5ee53e220565f99fc4084f33.tar.bz2 opensim-SC-caa19862fa9a26bc5ee53e220565f99fc4084f33.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'LICENSE.txt')
0 files changed, 0 insertions, 0 deletions