]> de.git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ddd126 ce07e8f)
Merge branch 'cooking' of github.com:graphitemaster/gmqcc into cooking
authorDale Weiler <killfieldengine@gmail.com>
Tue, 10 Sep 2013 23:16:14 +0000 (19:16 -0400)
committerDale Weiler <killfieldengine@gmail.com>
Tue, 10 Sep 2013 23:16:14 +0000 (19:16 -0400)

Trivial merge