diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
Diffstat (limited to 'bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1-i686.so')
0 files changed, 0 insertions, 0 deletions
index : opensim-SC_OLD | ||
My fork of OpenSim for IG and MG, called SledjChisl. |
aboutsummaryrefslogtreecommitdiffstatshomepage |