]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c73f11 4a5fa1a)
Merge branch 'master' of /var/cache/git/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Thu, 14 Jun 2012 08:25:35 +0000 (10:25 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 14 Jun 2012 08:25:35 +0000 (10:25 +0200)

Trivial merge