]> de.git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1373af cec58b5)
Merge branch 'master' into ftepp
authorWolfgang (Blub) Bumiller <blub@speed.at>
Sun, 18 Nov 2012 12:06:29 +0000 (13:06 +0100)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Sun, 18 Nov 2012 12:06:29 +0000 (13:06 +0100)
1  2 
parser.c patch | diff1 | diff2 | blob | history

diff --cc parser.c
Simple merge