Merge branch 'master' into terencehill/string_prefixes_cleanup
authorterencehill <piuntn@gmail.com>
Tue, 3 Feb 2015 00:41:19 +0000 (01:41 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 3 Feb 2015 00:41:19 +0000 (01:41 +0100)
commit4dd3c23aa51dd6fe855d8c5d97126a12a372eb3b
treea241bf3aa4325dcb34dcd23b268a97641197326d
parentaa7127f2d3630e76c50d1cecfdc50c4a4836ee81
parent61c76972374b56c3df73abc2a71fe665fffc2212
Merge branch 'master' into terencehill/string_prefixes_cleanup

Conflicts:
qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
qcsrc/menu/xonotic/dialog_firstrun.qc
qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc
qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc
qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
qcsrc/menu/xonotic/dialog_settings_effects.qc
qcsrc/menu/xonotic/dialog_settings_game_hud.qc
qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc
qcsrc/menu/xonotic/dialog_settings_game_messages.qc
qcsrc/menu/xonotic/dialog_settings_input.qc