]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7beb2c7 d9f7b1c)
Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Wed, 29 May 2013 04:10:58 +0000 (06:10 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 29 May 2013 04:10:58 +0000 (06:10 +0200)

Trivial merge