]> git.rm.cloudns.org Git - xonotic/gmqcc.git/commitdiff
Merge branch 'cooking' of git://github.com/graphitemaster/gmqcc into cooking
authorWolfgang Bumiller <wry.git@bumiller.com>
Fri, 11 Oct 2013 12:11:40 +0000 (14:11 +0200)
committerWolfgang Bumiller <wry.git@bumiller.com>
Fri, 11 Oct 2013 12:11:40 +0000 (14:11 +0200)

Trivial merge