]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5861689 c60cc92)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 1 Jun 2011 04:48:03 +0000 (06:48 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 1 Jun 2011 04:48:03 +0000 (06:48 +0200)

Trivial merge