]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d677ba 74fce32)
Merge branch 'master' of github.com:graphitemaster/gmqcc
authorDale Weiler <killfieldengine@gmail.com>
Fri, 23 Nov 2012 20:06:11 +0000 (20:06 +0000)
committerDale Weiler <killfieldengine@gmail.com>
Fri, 23 Nov 2012 20:06:11 +0000 (20:06 +0000)

Trivial merge