]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ed200d ff6d55a)
Merge branch 'cooking' of github.com:graphitemaster/gmqcc into cooking
authorDale Weiler <killfieldengine@gmail.com>
Thu, 29 Aug 2013 11:08:03 +0000 (07:08 -0400)
committerDale Weiler <killfieldengine@gmail.com>
Thu, 29 Aug 2013 11:08:03 +0000 (07:08 -0400)

Trivial merge