From: FruitieX <fruitiex@gmail.com>
Date: Thu, 9 Jun 2011 11:47:22 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master' into fruitiex/animations
X-Git-Tag: xonotic-v0.6.0~40^2~76^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=62be2a57fa6ca4306e25c5c4400f56af865487e4;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master' into fruitiex/animations

Conflicts:
	defaultXonotic.cfg
	qcsrc/server/cl_weaponsystem.qc
---

62be2a57fa6ca4306e25c5c4400f56af865487e4