]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f24d0a 29a0f20)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Fri, 21 Sep 2012 18:40:53 +0000 (20:40 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 21 Sep 2012 18:40:53 +0000 (20:40 +0200)

Trivial merge