From: Dale Weiler <killfieldengine@gmail.com>
Date: Wed, 24 Apr 2013 01:46:53 +0000 (+0000)
Subject: Merge branch 'master' into cooking
X-Git-Tag: before-library~19
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dc8523c6503e014a463df42520b48f597c7655be;p=xonotic%2Fgmqcc.git

Merge branch 'master' into cooking
---

dc8523c6503e014a463df42520b48f597c7655be
diff --cc parser.c
index 66c3726,c50eb17..836f6ca
mode 100644,100755..100755
--- a/parser.c
+++ b/parser.c