]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: be47f86 7f0123c)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Sat, 6 Aug 2011 18:26:01 +0000 (20:26 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 6 Aug 2011 18:26:01 +0000 (20:26 +0200)

Trivial merge