]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4d775b 9112a86)
Merge branch 'master' of /var/cache/git/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Thu, 26 Jan 2012 14:52:44 +0000 (15:52 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 26 Jan 2012 14:52:44 +0000 (15:52 +0100)

Trivial merge