Merge branch 'master' into divVerent/fruitbalance
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 18:31:21 +0000 (20:31 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 18:31:21 +0000 (20:31 +0200)
1  2 
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc

Simple merge
Simple merge