]> de.git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6713c3f fe8457f)
Merge branch 'master' into blub/bc3
authorWolfgang Bumiller <wolfgang.linux@bumiller.com>
Thu, 19 Jul 2012 16:06:56 +0000 (18:06 +0200)
committerWolfgang Bumiller <wolfgang.linux@bumiller.com>
Thu, 19 Jul 2012 16:06:56 +0000 (18:06 +0200)
1  2 
ir.c patch | diff1 | diff2 | blob | history

diff --cc ir.c
Simple merge