]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/welcome_dialog
authorterencehill <piuntn@gmail.com>
Tue, 3 Feb 2015 18:32:51 +0000 (19:32 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 3 Feb 2015 18:46:05 +0000 (19:46 +0100)
commitc3b41654fd21757a1d35e5b9c9fdece57511ba29
tree218e30170a0f6bf1acc0257ddb41f50e10a97682
parentcfd3098e371b5fd7c8aee539bf698d6245595d64
parent61c76972374b56c3df73abc2a71fe665fffc2212
Merge branch 'master' into terencehill/welcome_dialog

Conflicts:
qcsrc/common/constants.qh
qcsrc/menu/classes.c
qcsrc/menu/command/menu_cmd.qc
qcsrc/client/main.qc
qcsrc/common/constants.qh
qcsrc/menu/classes.qc
qcsrc/menu/command/menu_cmd.qc
qcsrc/menu/xonotic/dialog_welcome.qc
qcsrc/menu/xonotic/mainwindow.qc
qcsrc/menu/xonotic/textlistbox.qc
qcsrc/server/cl_client.qc
qcsrc/server/command/cmd.qc