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

diff options

author	Melanie	2012-06-29 22:24:53 +0100
committer	Melanie	2012-06-29 22:24:53 +0100
commit	6137f37028a798f87af3f8afb71ec4856b2a5ad8 (patch)
tree	39289035f883415b5ccae36a9b2af1ad60c7acf6 /bin/assets/TexturesAssetSet/2a4880b6-b7a3-690a-2049-bfbe38eafb9f.j2c
parent	Merge branch 'avination' into careminster (diff)
parent	Move update of the final optional ODE total frame stat inside the OdeLock rat... (diff)
download	opensim-SC-6137f37028a798f87af3f8afb71ec4856b2a5ad8.zip opensim-SC-6137f37028a798f87af3f8afb71ec4856b2a5ad8.tar.gz opensim-SC-6137f37028a798f87af3f8afb71ec4856b2a5ad8.tar.bz2 opensim-SC-6137f37028a798f87af3f8afb71ec4856b2a5ad8.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs

Diffstat (limited to 'bin/assets/TexturesAssetSet/2a4880b6-b7a3-690a-2049-bfbe38eafb9f.j2c')

0 files changed, 0 insertions, 0 deletions