]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 1c355a2 8d6d52a)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Sun, 21 Nov 2010 19:38:04 +0000 (20:38 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 21 Nov 2010 19:38:04 +0000 (20:38 +0100)

Trivial merge