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)
commit22c0030471a750065e6c93eca404fdd19ad5d22f
tree7affcca4a40dfc41c80e87498c0b7217e41e49de
parent1194c6af3ef2abc72d7aaced018398ca43f860e4
parentc445450d257558c3426fc87a1d95fab4d03ce0a9
Merge branch 'master' into divVerent/forced-teams-by-idfp
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/teamplay.qc