]> 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: fcf118a 5345a90)
Merge branch 'master' into matthiaskrgr/lightspeed
authorMatthias Krüger <matthias.krueger@famsik.de>
Sun, 9 Jun 2013 07:20:35 +0000 (09:20 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Sun, 9 Jun 2013 07:20:35 +0000 (09:20 +0200)

Trivial merge