]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into matthiaskrgr/hudsetup
authorMatthias Krüger <matthias.krueger@famsik.de>
Fri, 11 Oct 2013 15:40:33 +0000 (17:40 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Fri, 11 Oct 2013 15:40:33 +0000 (17:40 +0200)
commitf26adf4fdd93240e1d95ab72a99046b50305a7df
treed7637e1028bc3d94599bacaff864a66c6a5f492e
parentf5de94e532efefa2fb6f38f72ac93921707d0855
parent6a28c11c8abd729c7f95ad7050d204aa2453d2ff
Merge branch 'master' into matthiaskrgr/hudsetup