Merge remote branch 'origin/master' into terencehill/centerprint_stuff
authorSamual <samual@xonotic.org>
Thu, 7 Jul 2011 22:15:25 +0000 (18:15 -0400)
committerSamual <samual@xonotic.org>
Thu, 7 Jul 2011 22:15:25 +0000 (18:15 -0400)
commit42b501c5da481b2598db9bfc1b93b06fede3657a
treebc5438e0e1e28fd4e03553facc3300bc05c114f9
parent9f98772df6aa640fb11b47c608a41edf10962026
parent4a6069480c3e18c35fc90ed231aff2e1f07f954d
Merge remote branch 'origin/master' into terencehill/centerprint_stuff
14 files changed:
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/miscfunctions.qc
qcsrc/client/vehicles/vehicles.qc
qcsrc/common/constants.qh
qcsrc/common/util.qh
qcsrc/server/arena.qc
qcsrc/server/cl_client.qc
qcsrc/server/ctf.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/gamemode_keepaway.qc
qcsrc/server/mutators/gamemode_keyhunt.qc
qcsrc/server/t_items.qc
qcsrc/server/w_minstanex.qc