Merge branch 'Mario/vehicles' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir...
authorMario <zacjardine@y7mail.com>
Tue, 2 Dec 2014 02:12:25 +0000 (13:12 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 2 Dec 2014 02:12:25 +0000 (13:12 +1100)
commitf4fd4cdece12340d2f78b64116d15f7046322115
tree4c5451a365ea7c2b97c4538802d204cd13f3d6da
parent3bd825ec4ff3c071ccefb2b4424339b3b4b49315
parentec35a80aca17ab1b089de598d9d5b864e5eb60cf
Merge branch 'Mario/vehicles' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into Mario/vehicles

Conflicts:
qcsrc/server/cl_weapons.qc
qcsrc/server/progs.src
qcsrc/client/View.qc