opensim-SC - My fork of OpenSim for IG and DG, called SledjChisl.

diff options

author	Melanie	2013-08-01 01:23:24 +0100
committer	Melanie	2013-08-01 01:23:24 +0100
commit	21f5e670303ee978c747567e674e5ebe256ad2c7 (patch)
tree	19c3740cbb8bf78d038e64b2fb66ea837cc8f724 /OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs
parent	Merge branch 'master' into careminster (diff)
parent	Include missing reference that probably stops windows build from commit 12995... (diff)
download	opensim-SC-21f5e670303ee978c747567e674e5ebe256ad2c7.zip opensim-SC-21f5e670303ee978c747567e674e5ebe256ad2c7.tar.gz opensim-SC-21f5e670303ee978c747567e674e5ebe256ad2c7.tar.bz2 opensim-SC-21f5e670303ee978c747567e674e5ebe256ad2c7.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs

Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs')

0 files changed, 0 insertions, 0 deletions