]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: d5461ef 2d51977)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Sun, 23 Jan 2011 18:33:52 +0000 (19:33 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 23 Jan 2011 18:33:52 +0000 (19:33 +0100)

Trivial merge