]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9572e3 0860b7a)
Merge branch 'cooking' of github.com:graphitemaster/gmqcc into cooking
authorDale Weiler <killfieldengine@gmail.com>
Sat, 23 Nov 2013 11:41:24 +0000 (06:41 -0500)
committerDale Weiler <killfieldengine@gmail.com>
Sat, 23 Nov 2013 11:41:24 +0000 (06:41 -0500)

Trivial merge