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

diff options

author	ubit	2012-07-16 00:34:51 +0200
committer	ubit	2012-07-16 00:34:51 +0200
commit	911ca5b80656552e96d952e1eece7f2a7d0e464c (patch)
tree	13d5c3b959667f8f9df4ed4fb3934e1868396f5c /bin/assets/TexturesAssetSet/99bd60a2-3250-efc9-2e39-2fbcadefbecc.j2c
parent	Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent	Merge branch 'avination' into ubitwork (diff)
download	opensim-SC-911ca5b80656552e96d952e1eece7f2a7d0e464c.zip opensim-SC-911ca5b80656552e96d952e1eece7f2a7d0e464c.tar.gz opensim-SC-911ca5b80656552e96d952e1eece7f2a7d0e464c.tar.bz2 opensim-SC-911ca5b80656552e96d952e1eece7f2a7d0e464c.tar.xz

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs

Diffstat (limited to 'bin/assets/TexturesAssetSet/99bd60a2-3250-efc9-2e39-2fbcadefbecc.j2c')

0 files changed, 0 insertions, 0 deletions