]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed8ce0b 7ffda37)
Merge branch 'master' into divVerent/fuzzer
authorRudolf Polzer <divverent@xonotic.org>
Mon, 17 Mar 2014 10:22:53 +0000 (11:22 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 17 Mar 2014 10:22:53 +0000 (11:22 +0100)

Trivial merge