]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into mirceakitsune/event_chasecam
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 22 Apr 2011 15:39:33 +0000 (18:39 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 22 Apr 2011 15:39:33 +0000 (18:39 +0300)
1  2 
defaultXonotic.cfg

Simple merge