]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 62ac7e9 856949a)
Merge branch 'cooking' of git://github.com/graphitemaster/gmqcc into cooking
authorWolfgang Bumiller <wry.git@bumiller.com>
Fri, 11 Oct 2013 12:10:57 +0000 (14:10 +0200)
committerWolfgang Bumiller <wry.git@bumiller.com>
Fri, 11 Oct 2013 12:10:57 +0000 (14:10 +0200)
1  2 
parser.c patch | diff1 | diff2 | blob | history

diff --cc parser.c
Simple merge