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)
commitac0133698b6b0cf951e42821864610b922fc344c
treeb8255a775660d2bb4f6be740ec22a2674b81244b
parentf72632a078a35c47c6771d1758d1c4093820b994
parente55b0af41ff296efc886dfaccf3f663f751f6502
Merge branch 'master' into divVerent/force_colors_teamplay
qcsrc/client/autocvars.qh