]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into tzork/gm_nexball
authorJakob MG <jakob_mg@hotmail.com>
Thu, 29 Dec 2011 20:37:24 +0000 (21:37 +0100)
committerJakob MG <jakob_mg@hotmail.com>
Thu, 29 Dec 2011 20:37:24 +0000 (21:37 +0100)
commit4b15b999e2716d2ddc35075f75910b330a6cbf5c
tree1f0da45203542b1b95dd1e28b5f501fb95b0b6f9
parent99eb3d6820995625e446e07bb417969192eb4122
parentd164d5cfd1682b682a0873363981e7a4a4a0efe7
Merge remote branch 'origin/master' into tzork/gm_nexball

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