]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into mirceakitsune/hud_postprocessing
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 27 Apr 2011 22:05:31 +0000 (01:05 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 27 Apr 2011 22:05:31 +0000 (01:05 +0300)
1  2 
defaultXonotic.cfg

Simple merge