Merge branch 'master' into terencehill/menu_gametype_tooltips_2 243/head
authorterencehill <piuntn@gmail.com>
Wed, 21 Oct 2015 08:22:02 +0000 (10:22 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 21 Oct 2015 08:22:02 +0000 (10:22 +0200)
commit18e2cd311a581f77ba8eb9c5421dd219ff5d760d
tree8216f45877ab0af283223bfed7eca3a8b176905d
parent03f978544a8b13a18cef1c7cc3dbcaba1c3aee4c
parent9d10bc36e52babb863751c0cf1d1b23b38fd000c
Merge branch 'master' into terencehill/menu_gametype_tooltips_2
qcsrc/menu/menu.qc
qcsrc/menu/xonotic/dialog_settings_game_model.qc