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

diff options

author	Melanie	2012-05-14 23:32:49 +0100
committer	Melanie	2012-05-14 23:32:49 +0100
commit	6126b6da72bc0d3265df1ec45901f10737173d9a (patch)
tree	2e645853cccef8591738a59a8b76bb14a0d2fb0b /bin/assets/TexturesAssetSet/Terrain Grass-abb783e6-3e93-26c0-248a-247666855da3.texture
parent	Merge branch 'avination' into careminster (diff)
parent	Save the Telehub and its Spawn Points in the OAR (diff)
download	opensim-SC-6126b6da72bc0d3265df1ec45901f10737173d9a.zip opensim-SC-6126b6da72bc0d3265df1ec45901f10737173d9a.tar.gz opensim-SC-6126b6da72bc0d3265df1ec45901f10737173d9a.tar.bz2 opensim-SC-6126b6da72bc0d3265df1ec45901f10737173d9a.tar.xz

Merge branch 'master' into careminster

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

Diffstat (limited to 'bin/assets/TexturesAssetSet/Terrain Grass-abb783e6-3e93-26c0-248a-247666855da3.texture')

0 files changed, 0 insertions, 0 deletions