]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8e2a47 f6792c3)
Merge branch 'cooking' of github.com:graphitemaster/gmqcc into cooking
authorDale Weiler <killfieldengine@gmail.com>
Sun, 28 Apr 2013 03:42:04 +0000 (03:42 +0000)
committerDale Weiler <killfieldengine@gmail.com>
Sun, 28 Apr 2013 03:42:04 +0000 (03:42 +0000)

Trivial merge