]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5b9559 3988aae)
Merge branch 'cooking' of github.com:graphitemaster/gmqcc into cooking
authorDale Weiler <killfieldengine@gmail.com>
Sat, 19 Oct 2013 06:53:46 +0000 (02:53 -0400)
committerDale Weiler <killfieldengine@gmail.com>
Sat, 19 Oct 2013 06:53:46 +0000 (02:53 -0400)

Trivial merge