Merge remote branch 'origin/master' into samual/menu_updates
authorSamual <samual@xonotic.org>
Tue, 3 Jan 2012 23:46:28 +0000 (18:46 -0500)
committerSamual <samual@xonotic.org>
Tue, 3 Jan 2012 23:46:28 +0000 (18:46 -0500)
commit26ec33d6d19e627b43ac2cb51f83f890b5176293
tree5f17208bf5f5154af793c98553df4694b899bbbd
parent58e995eeeec1b4c657b1204963d050e56760160d
parentb2737b5c99b7971099ffd2fefb9c8599c69f430b
Merge remote branch 'origin/master' into samual/menu_updates

Conflicts:
defaultXonotic.cfg
qcsrc/menu/xonotic/gametypelist.c
qcsrc/menu/xonotic/util.qc
qcsrc/menu/xonotic/util.qh
defaultXonotic.cfg
qcsrc/menu/xonotic/dialog_singleplayer.c
qcsrc/menu/xonotic/gametypelist.c
qcsrc/menu/xonotic/util.qc
qcsrc/menu/xonotic/util.qh