Merge branch 'master' into terencehill/centerprint_stuff
authorterencehill <piuntn@gmail.com>
Sun, 12 Jun 2011 23:53:36 +0000 (01:53 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 12 Jun 2011 23:53:36 +0000 (01:53 +0200)
commit900269c6bbf7fabfb9ab8976d8eace8ea7027271
treee7d9e318a32508b118e3d9e01eb5bb365e1e90b6
parent73431c4592776fb5b2792ab5d39ee56810abb89d
parent86fee8c7f8b9d0affa822b1a4d5a58406ae0a844
Merge branch 'master' into terencehill/centerprint_stuff
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/common/util.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/teamplay.qc
qcsrc/server/w_minstanex.qc