]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92c50bd bd4eebf)
Merge branch 'master' into divVerent/augenkrebs
authorRudolf Polzer <divverent@xonotic.org>
Mon, 30 Sep 2013 19:56:01 +0000 (21:56 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 30 Sep 2013 19:56:01 +0000 (21:56 +0200)

Trivial merge