]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 581d0df b26f531)
Merge branch 'cooking' of github.com:graphitemaster/gmqcc into cooking
authorDale Weiler <killfieldengine@gmail.com>
Tue, 27 Aug 2013 08:28:11 +0000 (04:28 -0400)
committerDale Weiler <killfieldengine@gmail.com>
Tue, 27 Aug 2013 08:28:11 +0000 (04:28 -0400)

Trivial merge