Merge branch 'master' into matthiaskrgr/hudsetup
authorMatthias Krüger <matthias.krueger@famsik.de>
Fri, 6 Mar 2015 14:35:32 +0000 (15:35 +0100)
committerMatthias Krüger <matthias.krueger@famsik.de>
Fri, 6 Mar 2015 14:35:32 +0000 (15:35 +0100)
commitd1ec6cd7b36e2c16817720fe5cce775fc3d26357
treefb6e74f5c13de6de1f925970feeb4c55d12fee22
parentf26adf4fdd93240e1d95ab72a99046b50305a7df
parentcbe6743ef05c17d65ab5e0733b69e1d1c350764c
Merge branch 'master' into matthiaskrgr/hudsetup
qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc