opensim-SC_OLD - My fork of OpenSim for IG and MG, called SledjChisl.

diff options

author	Melanie	2013-05-24 00:45:08 +0100
committer	Melanie	2013-05-24 00:45:08 +0100
commit	09c2cd0d76e62cbc7bb2d8b0f21caae901af1681 (patch)
tree	1856552dd68bfa23877f28842cb00e9e0089d1c4 /bin/inventory/NotecardsLibrary/NotecardsLibraryFolders.xml
parent	Merge branch 'master' into careminster (diff)
parent	BulletSim: specify directory for OpenSim.Region.Physics.Meshing (diff)
download	opensim-SC_OLD-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.zip opensim-SC_OLD-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.tar.gz opensim-SC_OLD-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.tar.bz2 opensim-SC_OLD-09c2cd0d76e62cbc7bb2d8b0f21caae901af1681.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

Diffstat (limited to 'bin/inventory/NotecardsLibrary/NotecardsLibraryFolders.xml')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: