]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/client/vehicles/spiderbot.qc
Merge branch 'master' into tzork/vehicles-2
authorRudolf Polzer <divverent@xonotic.org>
Mon, 20 Jun 2011 19:33:03 +0000 (21:33 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 20 Jun 2011 19:33:03 +0000 (21:33 +0200)
commit0cb3657fcecaadef31226c4181f07c871da3baf1
tree1237862d9cb0d0c6a92e26765ea1f01c6b8a8793
parent238376ec994c4d1899e78f9b44540b29b0a0558d
parentd8b3f7a704b226d8d3c2bed9e11f25401f913bdd
Merge branch 'master' into tzork/vehicles-2

Conflicts:
qcsrc/client/View.qc
qcsrc/client/View.qc