]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/uncrustify
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 8 Oct 2017 13:03:16 +0000 (15:03 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 8 Oct 2017 13:03:16 +0000 (15:03 +0200)
commitfb81a2595885a787e578075f6f2b3f6e8a230539
tree003ca9b958b4bf4d5eb41152da3009144b2cee8f
parent6924dba346b88af87a2bf2b4957947fce77a064b
parent425482b5caad604eca92a31068981f0fa0730293
Merge branch 'master' into martin-t/uncrustify