]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 842b0a1 33be9d4)
Merge branch 'master' of github.com:graphitemaster/gmqcc
authorDale Weiler <killfieldengine@gmail.com>
Sat, 29 Dec 2012 14:42:17 +0000 (14:42 +0000)
committerDale Weiler <killfieldengine@gmail.com>
Sat, 29 Dec 2012 14:42:17 +0000 (14:42 +0000)

Trivial merge