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)
commit29345718c6b14525a552a6281989d7e901179f75
tree2a362a3e6d27307cd4415c9679f905b3a5b34cfe
parent70e0121c311b23e870c263ef672e9778cb519c3e
parent2fb0fbad033bca114c3f398c1a3869173917b8a4
Merge remote branch 'origin/divVerent/forced-teams-by-idfp'
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh