]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9393b81 ad3995c)
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Fri, 26 Oct 2012 19:48:31 +0000 (21:48 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 26 Oct 2012 19:48:31 +0000 (21:48 +0200)

Trivial merge