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

diff options

author	Melanie	2012-06-15 15:48:34 +0100
committer	Melanie	2012-06-15 15:48:34 +0100
commit	ff21007b93cfea55f6b66bb08d0ab0810fcc77b5 (patch)
tree	3c91c2946b92676c16d0b84ded23315a9ad718bd /OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
parent	Merge branch 'master' into careminster (diff)
parent	Reapply the one change that was in the revert that was actually function, not (diff)
download	opensim-SC-ff21007b93cfea55f6b66bb08d0ab0810fcc77b5.zip opensim-SC-ff21007b93cfea55f6b66bb08d0ab0810fcc77b5.tar.gz opensim-SC-ff21007b93cfea55f6b66bb08d0ab0810fcc77b5.tar.bz2 opensim-SC-ff21007b93cfea55f6b66bb08d0ab0810fcc77b5.tar.xz

Merge branch 'avination' into careminster

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

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

0 files changed, 0 insertions, 0 deletions