]> 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: 43d21b6 5345a90)
Merge branch 'master' into matthiaskrgr/tarx
authorMatthias Krüger <matthias.krueger@famsik.de>
Sat, 15 Jun 2013 20:08:29 +0000 (22:08 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Sat, 15 Jun 2013 20:08:29 +0000 (22:08 +0200)

Trivial merge