Merge branch 'master' into divVerent/force_colors_teamplay
authorRudolf Polzer <divverent@xonotic.org>
Thu, 24 May 2012 10:57:36 +0000 (12:57 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 24 May 2012 10:57:36 +0000 (12:57 +0200)
1  2 
qcsrc/client/autocvars.qh

Simple merge