]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b53c74 8fc5fd2)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Thu, 25 Nov 2010 20:29:25 +0000 (21:29 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 25 Nov 2010 20:29:25 +0000 (21:29 +0100)

Trivial merge