aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
authorMelanie2012-04-24 21:30:12 +0100
committerMelanie2012-04-24 21:30:12 +0100
commitc5520dc83fbbab83bd341b77f7b137443988b0fc (patch)
tree92596941f74061d88bea7d65b18066994245c44d /OpenSim/Region/Application/OpenSim.cs
parentMerge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parentFixed problem with MySQL: it was possible for one thread to use an incomplete... (diff)
downloadopensim-SC-c5520dc83fbbab83bd341b77f7b137443988b0fc.zip
opensim-SC-c5520dc83fbbab83bd341b77f7b137443988b0fc.tar.gz
opensim-SC-c5520dc83fbbab83bd341b77f7b137443988b0fc.tar.bz2
opensim-SC-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/Region/Application/OpenSim.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-18 17:47:28 +0000