]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae49f49 2661560)
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Tue, 5 Jun 2012 17:10:32 +0000 (19:10 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 5 Jun 2012 17:10:32 +0000 (19:10 +0200)

Trivial merge