From: Jakob MG <jakob_mg@hotmail.com>
Date: Wed, 28 Mar 2012 19:17:13 +0000 (+0200)
Subject: Merge branch 'tzork/csqc-items' of git://de.git.xonotic.org/xonotic/xonotic-data... 
X-Git-Tag: xonotic-v0.7.0~312^2~48
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=988616c6116192918e86ce93b13ce3469e55f532;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'tzork/csqc-items' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into tzork/csqc-items

Conflicts:
	qcsrc/server/t_items.qc
---

988616c6116192918e86ce93b13ce3469e55f532