diff options
| author | Melanie | 2012-11-25 14:13:50 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-25 14:13:50 +0000 |
| commit | fd7a83f439132062d500471830eb26e7183d30bc (patch) | |
| tree | db581710c1a370ee4f5ac7a3b2f0dfc9bcbd5457 /bin/Nini.dll | |
| parent | Merge branch 'careminster' into avination (diff) | |
| parent | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff) | |
| download | opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.zip opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.tar.gz opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.tar.bz2 opensim-SC_OLD-fd7a83f439132062d500471830eb26e7183d30bc.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
Diffstat (limited to 'bin/Nini.dll')
0 files changed, 0 insertions, 0 deletions