Merge remote branch 'origin/divVerent/forced-teams-by-idfp'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 13 Nov 2010 21:17:41 +0000 (22:17 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 13 Nov 2010 21:17:41 +0000 (22:17 +0100)
1  2 
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh

Simple merge
Simple merge
Simple merge