]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 161bbec 3e43056)
Merge branch 'cooking' of github.com:graphitemaster/gmqcc into cooking
authorDale Weiler <weilercdale@gmail.com>
Thu, 31 Jul 2014 04:43:42 +0000 (00:43 -0400)
committerDale Weiler <weilercdale@gmail.com>
Thu, 31 Jul 2014 04:43:42 +0000 (00:43 -0400)

Trivial merge