]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/master' into terencehill/menu_weaponarena_weapon...
authorSamual Lenks <samual@xonotic.org>
Sun, 28 Apr 2013 23:09:42 +0000 (19:09 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 28 Apr 2013 23:09:42 +0000 (19:09 -0400)
1  2 
defaultXonotic.cfg
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c

Simple merge