projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3c600a 50c7a07)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 30 Aug 2011 07:43:50 +0000 (09:43 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 30 Aug 2011 07:43:50 +0000 (09:43 +0200)

Trivial merge