]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91c894d 7a29f65)
Merge branch 'cooking'
authorDale Weiler <killfieldengine@gmail.com>
Thu, 31 Oct 2013 12:22:54 +0000 (08:22 -0400)
committerDale Weiler <killfieldengine@gmail.com>
Thu, 31 Oct 2013 12:22:54 +0000 (08:22 -0400)

Trivial merge