]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'martin-t/okc2' into martin-t/master
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 9 Sep 2017 19:25:07 +0000 (21:25 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 9 Sep 2017 19:25:07 +0000 (21:25 +0200)
commit914409923f7174db844a87ed2e7874ae809aa98b
treef8fe335246ab0bffdedf4c67e7467ff8a9bae9e9
parentf72f731752c0f3a35a5bec1667689ee52a00e1e6
parentef456a7e36afd5c8279bb91a7d295b9b3fcd94c7
Merge branch 'martin-t/okc2' into martin-t/master