]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into matthiaskrgr/domicons
authorMatthias Krüger <matthias.krueger@famsik.de>
Mon, 30 Sep 2013 15:04:34 +0000 (17:04 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Mon, 30 Sep 2013 15:04:34 +0000 (17:04 +0200)
commit4ec5ed850416626ed5da445dc051f30df3a61a3d
treef86c81477f84bf083408a7d095ea7e33b0290fa8
parentbfdd2f47f15ff310a812598d5f1cdfdd185f17f7
parentc9817f1dec9a45efdc4b617c42cc5ca907162b47
Merge branch 'master' into matthiaskrgr/domicons