]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/dmgtext
authorMartin Taibr <taibr.martin@gmail.com>
Thu, 15 Feb 2018 10:20:56 +0000 (11:20 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Thu, 15 Feb 2018 10:20:56 +0000 (11:20 +0100)
commite8c534ca0de1fcd2a3bab8c9092cc910942d2e63
tree65314f6901542f91994c3a38f6eb2c9b08dd6d29
parent915e94f39291a373a19bf9377c88884e8b0c3f42
parent37690e81b588e5a354b59988bbf6a679ead52c21
Merge branch 'master' into martin-t/dmgtext