]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6f08e7 fa14ca9)
Merge branch 'cooking' of github.com:graphitemaster/gmqcc into cooking
authorDale Weiler <killfieldengine@gmail.com>
Mon, 30 Sep 2013 18:33:57 +0000 (14:33 -0400)
committerDale Weiler <killfieldengine@gmail.com>
Mon, 30 Sep 2013 18:33:57 +0000 (14:33 -0400)

Trivial merge