]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/centerprint_stuff
authorterencehill <piuntn@gmail.com>
Wed, 22 Jun 2011 23:04:33 +0000 (01:04 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 22 Jun 2011 23:04:33 +0000 (01:04 +0200)
commit79ab84695f689fd7024d60c3429988f7c8774552
treed45f330270b130698c1524f924012051cde48c36
parent7f4a84a23e88abbcdd215b0d0e95799c65a644b3
parent2e44f19e0c92cf7fab9e7d21f15abda16118765b
Merge branch 'master' into terencehill/centerprint_stuff

Conflicts:
qcsrc/client/View.qc
14 files changed:
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/main.qh
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc
qcsrc/server/ctf.qc
qcsrc/server/defs.qh
qcsrc/server/gamecommand.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/gamemode_keepaway.qc
qcsrc/server/mutators/gamemode_keyhunt.qc
qcsrc/server/t_items.qc