]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into matthiaskrgr/srgb
authorMatthias Krüger <matthias.krueger@famsik.de>
Fri, 28 Aug 2015 16:44:51 +0000 (18:44 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Fri, 28 Aug 2015 16:44:51 +0000 (18:44 +0200)
commit900ea1cd36976b5b5f539d5ee65c742aeeedca05
tree267198281933b38b61050403a212905a3e70d6f8
parent8e57d522bbcb5376ad7998cc8d72ca348cd5757a
parentb9591a4d569bb22e16b4df25e4352cc2295c5ebb
Merge branch 'master' into matthiaskrgr/srgb