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

diff options

author	Melanie	2012-08-18 13:17:39 +0100
committer	Melanie	2012-08-18 13:17:39 +0100
commit	aee7a31bc3b5348c883e0d750bab991d853db642 (patch)
tree	9d38c2ec7cc62019ab3ea95a3716d28e1451c397 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins
parent	Merge branch 'master' into careminster (diff)
parent	Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
download	opensim-SC_OLD-aee7a31bc3b5348c883e0d750bab991d853db642.zip opensim-SC_OLD-aee7a31bc3b5348c883e0d750bab991d853db642.tar.gz opensim-SC_OLD-aee7a31bc3b5348c883e0d750bab991d853db642.tar.bz2 opensim-SC_OLD-aee7a31bc3b5348c883e0d750bab991d853db642.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: