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

diff options

author	Melanie	2013-02-05 21:30:12 +0000
committer	Melanie	2013-02-05 21:30:12 +0000
commit	d3892bbd0674e4f6912ce89e54712ea405dbbfb8 (patch)
tree	70ea1e0fea0e7eff5664bed1103e63d08c7b1c47 /OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
parent	Merge branch 'master' into careminster (diff)
parent	Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
download	opensim-SC_OLD-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.zip opensim-SC_OLD-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.tar.gz opensim-SC_OLD-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.tar.bz2 opensim-SC_OLD-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IFriendsModule.cs')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: