]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d01404 f7cd918)
Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 1 Sep 2011 09:54:15 +0000 (11:54 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 1 Sep 2011 09:54:15 +0000 (11:54 +0200)

Trivial merge