From: Mario <zacjardine@y7mail.com>
Date: Tue, 2 Dec 2014 02:12:25 +0000 (+1100)
Subject: Merge branch 'Mario/vehicles' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir... 
X-Git-Tag: xonotic-v0.8.2~2059^2~19
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f4fd4cdece12340d2f78b64116d15f7046322115;p=xonotic%2Fxonotic-data.pk3dir.git

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
---

f4fd4cdece12340d2f78b64116d15f7046322115