]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: a355954 c34f5d2)
Merge branch 'cooking' of github.com:graphitemaster/gmqcc into cooking
authorDale Weiler <killfieldengine@gmail.com>
Fri, 1 Feb 2013 23:11:26 +0000 (23:11 +0000)
committerDale Weiler <killfieldengine@gmail.com>
Fri, 1 Feb 2013 23:11:26 +0000 (23:11 +0000)

Trivial merge