projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e918e4 eb3ed7c)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 15 Dec 2010 11:38:08 +0000 (12:38 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 15 Dec 2010 11:38:08 +0000 (12:38 +0100)

Trivial merge