]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into tzork/gm_nexball
authorJakob MG <jakob_mg@hotmail.com>
Tue, 28 Feb 2012 05:42:06 +0000 (06:42 +0100)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 28 Feb 2012 05:42:06 +0000 (06:42 +0100)
commit2c5bebce47736537b1a2311fb52db41a481f27f1
tree828f679a418a9ebd66980de30f26b6385d8e21b6
parent70dbd52151c76d8300738a163ed92768ad606b15
parentbd80025e7bae8d4805664dc1bd7f241178cb1230
Merge remote-tracking branch 'origin/master' into tzork/gm_nexball

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