Merge branch 'tzork/gm_nexball' of git://de.git.xonotic.org/xonotic/xonotic-data...
authorJakob MG <jakob_mg@hotmail.com>
Sat, 14 Jan 2012 09:26:44 +0000 (10:26 +0100)
committerJakob MG <jakob_mg@hotmail.com>
Sat, 14 Jan 2012 09:26:44 +0000 (10:26 +0100)
commit70dbd52151c76d8300738a163ed92768ad606b15
treea2efd4b7c6e45ef9839b443c2412a27f7721dc16
parent2d2a167c9d4f4ffd8f4234309c936d99e842869b
parent4b15b999e2716d2ddc35075f75910b330a6cbf5c
Merge branch 'tzork/gm_nexball' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into tzork/gm_nexball

Conflicts:
qcsrc/server/teamplay.qc
qcsrc/server/cl_weapons.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/teamplay.qc