]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 60d5358 6394b67)
Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Sat, 23 Oct 2010 15:35:45 +0000 (17:35 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 23 Oct 2010 15:35:45 +0000 (17:35 +0200)

Trivial merge