From: Mario <mario.mario@y7mail.com>
Date: Tue, 25 Jun 2013 06:10:26 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.0~241^2^2~180
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b7948bdfd215689f16cacc3467944f2517a2f5a8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/monsters
---

b7948bdfd215689f16cacc3467944f2517a2f5a8
diff --cc qcsrc/qccversion
index 000000000,000000000..27afd2127
new file mode 100644
--- /dev/null
+++ b/qcsrc/qccversion
@@@ -1,0 -1,0 +1,1 @@@
++This file intentionally left blank.