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

diff options

author	Melanie	2013-06-04 21:09:25 +0100
committer	Melanie	2013-06-04 21:09:25 +0100
commit	648e258b8e79e52df18f41f2ec79016a095f7766 (patch)
tree	de96993d11a0183ac026cec61e0e5a937f801c3c /bin/config-include/FlotsamCache.ini.example
parent	Merge branch 'master' into careminster (diff)
parent	New HttpServer_OpenSim.dll with increased limits on number of connections, re... (diff)
download	opensim-SC_OLD-648e258b8e79e52df18f41f2ec79016a095f7766.zip opensim-SC_OLD-648e258b8e79e52df18f41f2ec79016a095f7766.tar.gz opensim-SC_OLD-648e258b8e79e52df18f41f2ec79016a095f7766.tar.bz2 opensim-SC_OLD-648e258b8e79e52df18f41f2ec79016a095f7766.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs

Diffstat (limited to 'bin/config-include/FlotsamCache.ini.example')

0 files changed, 0 insertions, 0 deletions