]> 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: 77faf54 ecde008)
Merge branch 'master' into HEAD
authorRudolf Polzer <divverent@xonotic.org>
Fri, 15 May 2015 05:32:22 +0000 (07:32 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 15 May 2015 05:32:22 +0000 (07:32 +0200)

Trivial merge