]> git.rm.cloudns.org Git - xonotic/gmqcc.git/commitdiff
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

diff --cc ftepp.c
Simple merge