]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35309a6 03630e8)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Fri, 16 Sep 2011 22:48:50 +0000 (00:48 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 16 Sep 2011 22:48:50 +0000 (00:48 +0200)

Trivial merge