]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into mirceakitsune/nex_reticle
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 23 Jun 2010 11:22:00 +0000 (14:22 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 23 Jun 2010 11:22:00 +0000 (14:22 +0300)
1  2 
defaultXonotic.cfg

Simple merge