Merge branch 'master' into terencehill/menu_tooltips_2
authorterencehill <piuntn@gmail.com>
Thu, 20 Jan 2011 23:23:13 +0000 (00:23 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 20 Jan 2011 23:23:13 +0000 (00:23 +0100)
commit2886ed5676755f4242704d64d3315124026496bb
tree7ec067ac2a9ae83a8fc239449dc1f2fc2e75bcad
parenta815eac87d47b74c06dea10cee1d9cfa315d87ab
parent0209288d556022db3c72b07e25da1d20e00f9337
Merge branch 'master' into terencehill/menu_tooltips_2

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