]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d15142 6b57537)
Merge branch 'master' of github.com:graphitemaster/gmqcc
authorDale Weiler <killfieldengine@gmail.com>
Sun, 2 Dec 2012 23:17:07 +0000 (23:17 +0000)
committerDale Weiler <killfieldengine@gmail.com>
Sun, 2 Dec 2012 23:17:07 +0000 (23:17 +0000)

Trivial merge