]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cbaf909 48d330a)
Merge branch 'master' into blub/bc3
authorWolfgang (Blub) Bumiller <blub@speed.at>
Sat, 11 Aug 2012 09:46:59 +0000 (11:46 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Sat, 11 Aug 2012 09:46:59 +0000 (11:46 +0200)
1  2 
ir.c patch | diff1 | diff2 | blob | history

diff --cc ir.c
Simple merge