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

diff options

author	Melanie	2013-10-06 18:32:20 +0100
committer	Melanie	2013-10-06 18:32:20 +0100
commit	69054ad134f4418b344227b2b0cb42aa77bb3d78 (patch)
tree	e46a68f215aeff4122aad078cbaacaa59f49c9c2 /OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
parent	Merge branch 'master' into careminster (diff)
parent	* Added a unique and interesting WebSocket grid login processor by hijacking ... (diff)
download	opensim-SC-69054ad134f4418b344227b2b0cb42aa77bb3d78.zip opensim-SC-69054ad134f4418b344227b2b0cb42aa77bb3d78.tar.gz opensim-SC-69054ad134f4418b344227b2b0cb42aa77bb3d78.tar.bz2 opensim-SC-69054ad134f4418b344227b2b0cb42aa77bb3d78.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs

Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs')

0 files changed, 0 insertions, 0 deletions