]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 9e1082c 5dfb376)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Fri, 19 Nov 2010 12:49:26 +0000 (13:49 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 19 Nov 2010 12:49:26 +0000 (13:49 +0100)

Trivial merge