]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/master' into samual/menu_updates
authorSamual <samual@xonotic.org>
Wed, 18 Jan 2012 16:18:27 +0000 (11:18 -0500)
committerSamual <samual@xonotic.org>
Wed, 18 Jan 2012 16:18:27 +0000 (11:18 -0500)
Conflicts:
qcsrc/menu/xonotic/dialog_settings_network.c

1  2 
defaultXonotic.cfg

Simple merge