From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 20 Jun 2011 19:33:03 +0000 (+0200)
Subject: Merge branch 'master' into tzork/vehicles-2
X-Git-Tag: xonotic-v0.5.0~199^2~11^2~2
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=0cb3657fcecaadef31226c4181f07c871da3baf1;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into tzork/vehicles-2

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

0cb3657fcecaadef31226c4181f07c871da3baf1