]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5b810a 747b4d8)
Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Thu, 1 Sep 2011 09:48:07 +0000 (11:48 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 1 Sep 2011 09:48:07 +0000 (11:48 +0200)

Trivial merge