]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 7024ebf f1ab19b)
Merge branch 'cooking' of github.com:graphitemaster/gmqcc into cooking
authorDale Weiler <weilercdale@gmail.com>
Sun, 25 May 2014 06:56:40 +0000 (02:56 -0400)
committerDale Weiler <weilercdale@gmail.com>
Sun, 25 May 2014 06:56:40 +0000 (02:56 -0400)

Trivial merge