Merge branch 'master' into divVerent/forced-teams-by-idfp
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 11 Nov 2010 13:16:59 +0000 (14:16 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 11 Nov 2010 13:16:59 +0000 (14:16 +0100)
1  2 
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/teamplay.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge