]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03b56bd dfbd093)
Merge branch 'master' into cooking
authorWolfgang Bumiller <wry.git@bumiller.com>
Mon, 30 Sep 2013 13:02:03 +0000 (15:02 +0200)
committerWolfgang Bumiller <wry.git@bumiller.com>
Mon, 30 Sep 2013 13:02:03 +0000 (15:02 +0200)
1  2 
doc/gmqcc.1 patch | diff1 | diff2 | blob | history

diff --cc doc/gmqcc.1
Simple merge