]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/hud_postprocessing
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 13 Jun 2011 14:13:14 +0000 (17:13 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 13 Jun 2011 14:13:14 +0000 (17:13 +0300)
commit60f1e3301beae3dac0765d8ee8eb350ee21c8f30
tree52f4e900e388d132a3effc874eb363922e41351c
parentee38b5a0b6d863502744e7fdbb3e3d9a0a394147
parent64d7072dd1ac95fe0f724ec474751321b8c697f2
Merge branch 'master' into mirceakitsune/hud_postprocessing
defaultXonotic.cfg