]> 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: a7bb8bf bd4eebf)
Merge branch 'master' into matthiaskrgr/stormkeep_barrel_readd
authorMatthias Krüger <matthias.krueger@famsik.de>
Fri, 20 Sep 2013 14:22:40 +0000 (16:22 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Fri, 20 Sep 2013 14:22:40 +0000 (16:22 +0200)

Trivial merge