]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b923a0 1dfd375)
Merge branch 'master' into cooking
authorWolfgang Bumiller <blub@speed.at>
Tue, 12 Feb 2013 13:31:27 +0000 (14:31 +0100)
committerWolfgang Bumiller <blub@speed.at>
Tue, 12 Feb 2013 13:31:27 +0000 (14:31 +0100)
1  2 
ftepp.c patch | diff1 | diff2 | blob | history

diff --cc ftepp.c
Simple merge