Merge branch 'master' into terencehill/centerprint_stuff
authorterencehill <piuntn@gmail.com>
Sat, 16 Jul 2011 20:37:21 +0000 (22:37 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 16 Jul 2011 20:37:21 +0000 (22:37 +0200)
commit44effb3a66f8b44d05106ff361ef5fc126fef03b
tree07597fc66911e963b699b371856646b660f00750
parent22cb4c947fe09c39d4ff0a3cdb629225b92c5c5c
parent4eb8ac8989271d4b19f6ed823133c69933c7e21a
Merge branch 'master' into terencehill/centerprint_stuff
14 files changed:
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qh
qcsrc/client/main.qh
qcsrc/client/miscfunctions.qc
qcsrc/client/scoreboard.qc
qcsrc/common/constants.qh
qcsrc/server/ctf.qc
qcsrc/server/defs.qh
qcsrc/server/mutators/gamemode_keepaway.qc
qcsrc/server/t_items.qc
qcsrc/server/w_minstanex.qc