]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4edfb6d c38aad8)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Thu, 26 Jan 2012 16:15:49 +0000 (17:15 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 26 Jan 2012 16:15:49 +0000 (17:15 +0100)

Trivial merge