Merge branch 'matthiaskrgr/srgb' of ssh://gitlab.com/xonotic/xonotic-maps.pk3dir...
authorMirio <opivy@hotmail.de>
Fri, 4 Sep 2015 14:51:53 +0000 (16:51 +0200)
committerMirio <opivy@hotmail.de>
Fri, 4 Sep 2015 14:51:53 +0000 (16:51 +0200)
commit194df547b8d16fb432b58986619a4b7a9869f4af
treed4d72a0ddcf69cc3c8e3b7645581eb356445b23a
parent05bf7f676e59bcf61a7867934314cded531da4b8
parentd03d329309cf9fe27e327f4539362b2a3ac532bd
Merge branch 'matthiaskrgr/srgb' of ssh://gitlab.com/xonotic/xonotic-maps.pk3dir into matthiaskrgr/srgb