Merge branch 'master' into terencehill/menu_tooltips_2
authorterencehill <piuntn@gmail.com>
Sat, 17 Sep 2011 15:51:05 +0000 (17:51 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 17 Sep 2011 15:51:05 +0000 (17:51 +0200)
commit80cd34d0a48e975018605aabebacba50e8029585
tree258d8a0748c19d71b01e2a7133b0207d9a819c6a
parent035bf39a43b781aa52232576f20b55851a4aa8fc
parent8a425d38c48f00e5b307d18200af26e01e1e8f6c
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
tooltips.db