]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99971b7 704394c)
Merge branch 'master' of github.com:graphitemaster/gmqcc
authorDale Weiler <killfieldengine@gmail.com>
Sat, 5 May 2012 02:01:26 +0000 (22:01 -0400)
committerDale Weiler <killfieldengine@gmail.com>
Sat, 5 May 2012 02:01:26 +0000 (22:01 -0400)

Trivial merge