]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into matthiaskrgr/srgb
authorMatthias Krüger <matthias.krueger@famsik.de>
Mon, 31 Aug 2015 15:56:09 +0000 (17:56 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Mon, 31 Aug 2015 15:56:09 +0000 (17:56 +0200)
commit5de00aed30cd8774e9951f883193675099deb42f
treec1fce7522335ced19dcdf0bd346c3df6b8ad67fe
parentbd69480ee997d2cb2febb471eae29c1d4262ba1c
parentb9cc27af323228bc65160dbbddb031739909ac58
Merge branch 'master' into matthiaskrgr/srgb