]> de.git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fdc9838 db879bd)
Merge branch 'master' into blub/ast-and-ir-merging
authorWolfgang (Blub) Bumiller <blub@speed.at>
Fri, 27 Apr 2012 09:05:57 +0000 (11:05 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Fri, 27 Apr 2012 09:05:57 +0000 (11:05 +0200)
1  2 
gmqcc.h patch | diff1 | diff2 | blob | history

diff --cc gmqcc.h
Simple merge