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

diff options

author	Melanie	2012-04-24 21:30:12 +0100
committer	Melanie	2012-04-24 21:30:12 +0100
commit	c5520dc83fbbab83bd341b77f7b137443988b0fc (patch)
tree	92596941f74061d88bea7d65b18066994245c44d /OpenSim/Framework
parent	Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parent	Fixed problem with MySQL: it was possible for one thread to use an incomplete... (diff)
download	opensim-SC_OLD-c5520dc83fbbab83bd341b77f7b137443988b0fc.zip opensim-SC_OLD-c5520dc83fbbab83bd341b77f7b137443988b0fc.tar.gz opensim-SC_OLD-c5520dc83fbbab83bd341b77f7b137443988b0fc.tar.bz2 opensim-SC_OLD-c5520dc83fbbab83bd341b77f7b137443988b0fc.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

Diffstat (limited to 'OpenSim/Framework')

0 files changed, 0 insertions, 0 deletions