]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/welcome_dialog
authorterencehill <piuntn@gmail.com>
Mon, 19 Jan 2015 18:21:08 +0000 (19:21 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 19 Jan 2015 18:21:08 +0000 (19:21 +0100)
commitcfd3098e371b5fd7c8aee539bf698d6245595d64
tree424d858e247bd3ff5c2c6fcb53532d961a116e9a
parentb6a81d33f198580385e7f4f3bed27e751612cc98
parentdcf8a85693db60468fde21e1eaa64043576edb0d
Merge branch 'master' into terencehill/welcome_dialog

Conflicts:
gfx/menu/luminos/skinvalues.txt
gfx/menu/wickedx/skinvalues.txt
gfx/menu/xaw/skinvalues.txt
qcsrc/client/Main.qc
qcsrc/common/constants.qh
qcsrc/menu/xonotic/mainwindow.c
12 files changed:
commands.cfg
gfx/menu/luminos/skinvalues.txt
gfx/menu/wickedx/skinvalues.txt
gfx/menu/xaw/skinvalues.txt
qcsrc/client/Main.qc
qcsrc/common/constants.qh
qcsrc/menu/classes.c
qcsrc/menu/command/menu_cmd.qc
qcsrc/menu/skin-customizables.inc
qcsrc/menu/xonotic/mainwindow.c
qcsrc/server/cl_client.qc
qcsrc/server/command/cmd.qc