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

diff options

author	Melanie	2013-02-10 00:17:14 +0000
committer	Melanie	2013-02-10 00:17:14 +0000
commit	069e587841465d8d041164929e27fc891b66a64a (patch)
tree	c37a59b837bfbac696850a7af2b8f20c520141ba /OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
parent	Merge branch 'master' into careminster (diff)
parent	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download	opensim-SC_OLD-069e587841465d8d041164929e27fc891b66a64a.zip opensim-SC_OLD-069e587841465d8d041164929e27fc891b66a64a.tar.gz opensim-SC_OLD-069e587841465d8d041164929e27fc891b66a64a.tar.bz2 opensim-SC_OLD-069e587841465d8d041164929e27fc891b66a64a.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations

Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs')

0 files changed, 0 insertions, 0 deletions