]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dde5d0f 0508f0a)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Thu, 20 Oct 2011 19:49:47 +0000 (21:49 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 20 Oct 2011 19:49:47 +0000 (21:49 +0200)

Trivial merge