]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 067294a 60a5d8a)
Merge branch 'master' into blub/parser
authorWolfgang (Blub) Bumiller <blub@speed.at>
Sun, 12 Aug 2012 16:45:22 +0000 (18:45 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Sun, 12 Aug 2012 16:45:22 +0000 (18:45 +0200)
1  2 
ir.c patch | diff1 | diff2 | blob | history

diff --cc ir.c
Simple merge