]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d636e64 41be9cd)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 7 Nov 2011 12:53:46 +0000 (13:53 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 7 Nov 2011 12:53:46 +0000 (13:53 +0100)

Trivial merge