opensim-SC_OLD - My fork of OpenSim for IG and MG, called SledjChisl.

diff options

author	Melanie	2013-07-24 03:50:09 +0100
committer	Melanie	2013-07-24 03:50:09 +0100
commit	a7eb1b5b855b3caa6c4622789ef1377830e2f435 (patch)
tree	2bd58bcd2bd9b37adeb746f4b399b1d98539d1cf /bin/assets/TexturesAssetSet/rooftiles2_roy.jp2
parent	Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parent	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download	opensim-SC_OLD-a7eb1b5b855b3caa6c4622789ef1377830e2f435.zip opensim-SC_OLD-a7eb1b5b855b3caa6c4622789ef1377830e2f435.tar.gz opensim-SC_OLD-a7eb1b5b855b3caa6c4622789ef1377830e2f435.tar.bz2 opensim-SC_OLD-a7eb1b5b855b3caa6c4622789ef1377830e2f435.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

Diffstat (limited to 'bin/assets/TexturesAssetSet/rooftiles2_roy.jp2')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: