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

diff options

author	Melanie	2012-10-18 20:56:34 +0100
committer	Melanie	2012-10-18 20:56:34 +0100
commit	72c925a6c9eb4dea6f9134db10c3af28ea83df48 (patch)
tree	9f991ade4e71f91fc612759b4e783c9f01a740f3 /bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib
parent	Merge branch 'master' into careminster (diff)
parent	Remove redundant and annoyingly modal message box in upload processing. (diff)
download	opensim-SC_OLD-72c925a6c9eb4dea6f9134db10c3af28ea83df48.zip opensim-SC_OLD-72c925a6c9eb4dea6f9134db10c3af28ea83df48.tar.gz opensim-SC_OLD-72c925a6c9eb4dea6f9134db10c3af28ea83df48.tar.bz2 opensim-SC_OLD-72c925a6c9eb4dea6f9134db10c3af28ea83df48.tar.xz

Merge branch 'avination' into careminster

Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/Physics/OdePlugin/OdeScene.cs

Diffstat (limited to 'bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib')

0 files changed, 0 insertions, 0 deletions