projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: defbde6 0af14c7)
Merge branch 'divVerent/noautomaplist' into matthiaskrgr/hudsetup
authorMatthias Krüger <matthias.krueger@famsik.de>
Tue, 20 Aug 2013 11:32:03 +0000 (13:32 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Tue, 20 Aug 2013 11:32:03 +0000 (13:32 +0200)

Trivial merge