]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
Merge branch 'cooking' of github.com:graphitemaster/gmqcc into cooking
authorDale Weiler <killfieldengine@gmail.com>
Tue, 24 Sep 2013 11:32:23 +0000 (07:32 -0400)
committerDale Weiler <killfieldengine@gmail.com>
Tue, 24 Sep 2013 11:32:23 +0000 (07:32 -0400)

Trivial merge