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

diff options

author	Melanie	2012-10-03 00:24:33 +0100
committer	Melanie	2012-10-03 00:24:33 +0100
commit	23d5bafa7f5e7b23ea36300de8096c7dc84e51b0 (patch)
tree	044eb97d800f1ce82bfb0367488eb8752b3e6aa6 /OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
parent	Merge branch 'master' into careminster (diff)
parent	Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
download	opensim-SC-23d5bafa7f5e7b23ea36300de8096c7dc84e51b0.zip opensim-SC-23d5bafa7f5e7b23ea36300de8096c7dc84e51b0.tar.gz opensim-SC-23d5bafa7f5e7b23ea36300de8096c7dc84e51b0.tar.bz2 opensim-SC-23d5bafa7f5e7b23ea36300de8096c7dc84e51b0.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs

Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs')

0 files changed, 0 insertions, 0 deletions