]> git.rm.cloudns.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: edd5da4 8dccf69)
Merge branch 'master' into blub/bc3
authorWolfgang (Blub) Bumiller <blub@speed.at>
Wed, 8 Aug 2012 10:43:26 +0000 (12:43 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Wed, 8 Aug 2012 10:43:26 +0000 (12:43 +0200)
1  2 
main.c patch | diff1 | diff2 | blob | history

diff --cc main.c
Simple merge