diff options
| author | ubit | 2012-07-16 00:01:05 +0200 |
|---|---|---|
| committer | ubit | 2012-07-16 00:01:05 +0200 |
| commit | 13e1635e4dda337325b1da92ee60fa17c2cdee36 (patch) | |
| tree | 684260b2912e3477fed271f548b6ae28b0645c19 /ThirdPartyLicenses/CSJ2K.txt | |
| parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
| parent | Merge branch 'avination' into ubitwork (diff) | |
| download | opensim-SC-13e1635e4dda337325b1da92ee60fa17c2cdee36.zip opensim-SC-13e1635e4dda337325b1da92ee60fa17c2cdee36.tar.gz opensim-SC-13e1635e4dda337325b1da92ee60fa17c2cdee36.tar.bz2 opensim-SC-13e1635e4dda337325b1da92ee60fa17c2cdee36.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 'ThirdPartyLicenses/CSJ2K.txt')
0 files changed, 0 insertions, 0 deletions