]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/client/vehicles/spiderbot.qc
Merge remote-tracking branch 'origin/master' into tzork/vehicles-2
authorJakob MG <jakob_mg@hotmail.com>
Tue, 5 Apr 2011 20:40:06 +0000 (22:40 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 5 Apr 2011 20:40:06 +0000 (22:40 +0200)
commiteacbba2db6bdb7d961fdab870c2095b5581f434f
tree2f45b597466385c15ef7b013dff90de2798fab7d
parent2641ef2e3f1c38b98c0ef7d382ce665815b258ac
parent86f116a07659e793c466b0e14c13ff930f0c5775
Merge remote-tracking branch 'origin/master' into tzork/vehicles-2
qcsrc/client/hud.qc
qcsrc/server/cl_player.qc