]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4fbba5 370b542)
Merge branch 'cooking' of github.com:graphitemaster/gmqcc into cooking
authorDale Weiler <killfieldengine@gmail.com>
Sun, 27 Jan 2013 12:56:43 +0000 (12:56 +0000)
committerDale Weiler <killfieldengine@gmail.com>
Sun, 27 Jan 2013 12:56:43 +0000 (12:56 +0000)

Trivial merge