]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into mirceakitsune/rendering_tweaks
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 23 Aug 2011 18:39:40 +0000 (21:39 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 23 Aug 2011 18:39:40 +0000 (21:39 +0300)
1  2 
defaultXonotic.cfg

Simple merge