]> git.rm.cloudns.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b51b35 95dd0fc)
Merge branch 'master' into cooking
authorWolfgang Bumiller <blub@speed.at>
Sun, 3 Feb 2013 18:01:30 +0000 (19:01 +0100)
committerWolfgang Bumiller <blub@speed.at>
Sun, 3 Feb 2013 18:01:30 +0000 (19:01 +0100)
1  2 
opts.c patch | diff1 | diff2 | blob | history

diff --cc opts.c
Simple merge