Merge remote-tracking branch 'origin/master' into tzork/gm_nexball
authorJakob MG <jakob_mg@hotmail.com>
Sat, 14 Jan 2012 09:23:25 +0000 (10:23 +0100)
committerJakob MG <jakob_mg@hotmail.com>
Sat, 14 Jan 2012 09:23:25 +0000 (10:23 +0100)
commit2d2a167c9d4f4ffd8f4234309c936d99e842869b
tree2e2d965a7eb766953453b888529ad023a0241013
parentc9749644cd3944ef5ee0381cf118e76113dd1ba6
parent59c6397f642469ec6ed72a83b658644ffa8c4205
Merge remote-tracking branch 'origin/master' into tzork/gm_nexball

Conflicts:
qcsrc/server/teamplay.qc
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/progs.src
qcsrc/server/teamplay.qc