Merge branch 'master' into terencehill/menu_gametype_tooltips_2
authorterencehill <piuntn@gmail.com>
Sat, 10 Oct 2015 11:32:08 +0000 (13:32 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 10 Oct 2015 11:32:08 +0000 (13:32 +0200)
commit03f978544a8b13a18cef1c7cc3dbcaba1c3aee4c
treed57146848ff240219dcd324757f443982c6ed8ad
parent863532534585ebbb912e7509c17245c52e9e85f1
parent67a16f3121a7d968a096c2c24149ce232c4a21fb
Merge branch 'master' into terencehill/menu_gametype_tooltips_2

Conflicts:
qcsrc/menu/xonotic/dialog_settings_game.qc
qcsrc/common/mapinfo.qh
qcsrc/menu/item/listbox.qc
qcsrc/menu/xonotic/dialog_settings_game.qc