Merge branch 'terencehill/menu_remove_tab_title' of git://de.git.xonotic.org/xonotic...
authorterencehill <piuntn@gmail.com>
Sun, 10 May 2015 23:09:24 +0000 (01:09 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 10 May 2015 23:09:24 +0000 (01:09 +0200)
commitfbb96108e5828a7557694db4469c2d0d7c582846
tree361ff08bf6af24f4c682dcbfc57846fc4ff26439
parent444593e3a39d68e7c1357aeaaee85d7aec70ca70
parent61a847dbaab291d205cc9684b6d1a6e9bdad6375
Merge branch 'terencehill/menu_remove_tab_title' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into terencehill/menu_remove_tab_title

Conflicts:
qcsrc/menu/item/dialog.qc
qcsrc/menu/item/dialog.qc
qcsrc/menu/item/tab.qc