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

diff options

author	Melanie	2013-06-23 01:59:57 +0100
committer	Melanie	2013-06-23 01:59:57 +0100
commit	f70357eaa355b8c152f3d793d0fceafa14df5fd4 (patch)
tree	ffda32c340bd7f6d69652e9d9a959c7396f42a2f /OpenSim/Data/SQLite/SQLiteSimulationData.cs
parent	Merge branch 'avination-current' into careminster (diff)
parent	Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
download	opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.zip opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.tar.gz opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.tar.bz2 opensim-SC_OLD-f70357eaa355b8c152f3d793d0fceafa14df5fd4.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteSimulationData.cs')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: