]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/defaults
authorMartin Taibr <taibr.martin@gmail.com>
Wed, 19 Jul 2017 13:55:20 +0000 (15:55 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Wed, 19 Jul 2017 13:55:20 +0000 (15:55 +0200)
commit91be51af76146036564f55499150039f62f772c5
tree6e9044df8dde6b54c939f7d74055c738f520a752
parent102d1e98f1532bc97a01d94ac78cbca92b9d3236
parent29ba411594428929a9e9a0e0baa620210213bec7
Merge branch 'master' into martin-t/defaults