Merge branch 'master' into terencehill/menu_tooltips_2
authorterencehill <piuntn@gmail.com>
Wed, 9 Mar 2011 20:55:07 +0000 (21:55 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 9 Mar 2011 20:55:07 +0000 (21:55 +0100)
commitb8f71d297050680a3b25b063375ca5feec9ff67b
tree9b6acb4f76d427013e77edc521b8ff22b0fe8996
parent30ab59f8f02c19d7d57ae67e963eb7ed581bfec9
parent09d98a2f7d09205efed74701ddea4c8a3ce24ed7
Merge branch 'master' into terencehill/menu_tooltips_2

Conflicts:
defaultXonotic.cfg
defaultXonotic.cfg
qcsrc/menu/menu.qc
qcsrc/menu/xonotic/util.qc
qcsrc/menu/xonotic/util.qh
tooltips.db