]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/server/command/common.qh
Merge remote-tracking branch 'origin/master' into terencehill/menu_remove_tab_title
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 10 May 2015 03:41:57 +0000 (13:41 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 10 May 2015 03:41:57 +0000 (13:41 +1000)
commit61a847dbaab291d205cc9684b6d1a6e9bdad6375
tree366400afcddee0732fe8aaf565724aa86d7e1f6f
parent77d45a36e18ce3de85a7d06869b3bc3e6411a6b2
parent263c592e468eeeffb2755d204b21eb13e398adac
Merge remote-tracking branch 'origin/master' into terencehill/menu_remove_tab_title

# Conflicts:
# qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
# qcsrc/menu/xonotic/dialog_settings_game_hud.qc
# qcsrc/menu/xonotic/dialog_settings_game_messages.qc
# qcsrc/menu/xonotic/dialog_settings_game_model.qc
# qcsrc/menu/xonotic/dialog_settings_game_view.qc
# qcsrc/menu/xonotic/dialog_settings_game_weapons.qc
23 files changed:
qcsrc/menu/item/tab.qc
qcsrc/menu/xonotic/dialog_multiplayer.qc
qcsrc/menu/xonotic/dialog_multiplayer_create.qc
qcsrc/menu/xonotic/dialog_multiplayer_join.qc
qcsrc/menu/xonotic/dialog_multiplayer_media.qc
qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc
qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc
qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc
qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
qcsrc/menu/xonotic/dialog_settings_audio.qc
qcsrc/menu/xonotic/dialog_settings_effects.qc
qcsrc/menu/xonotic/dialog_settings_game.qc
qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
qcsrc/menu/xonotic/dialog_settings_game_hud.qc
qcsrc/menu/xonotic/dialog_settings_game_messages.qc
qcsrc/menu/xonotic/dialog_settings_game_model.qc
qcsrc/menu/xonotic/dialog_settings_game_view.qc
qcsrc/menu/xonotic/dialog_settings_game_weapons.qc
qcsrc/menu/xonotic/dialog_settings_input.qc
qcsrc/menu/xonotic/dialog_settings_misc.qc
qcsrc/menu/xonotic/dialog_settings_user.qc
qcsrc/menu/xonotic/dialog_settings_video.qc
qcsrc/menu/xonotic/tab.qc