]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf293bc 6c076f9)
Merge remote-tracking branch 'origin/pp-unary-numbers'
authorWolfgang Bumiller <blub@speed.at>
Thu, 3 Jan 2013 13:58:02 +0000 (14:58 +0100)
committerWolfgang Bumiller <blub@speed.at>
Thu, 3 Jan 2013 13:58:02 +0000 (14:58 +0100)
1  2 
ftepp.c patch | diff1 | diff2 | blob | history

diff --cc ftepp.c
Simple merge