]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/okc2
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 3 Sep 2017 19:13:13 +0000 (21:13 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 3 Sep 2017 19:13:13 +0000 (21:13 +0200)
commitc89e099b706d9c07b2ce49fd267c0f35f06f2146
tree08cd5467667f43ba448727c241bd227327c131df
parent1ff9a197e96f815191d3532afabfbd51d00d8c83
parent529205ae72f71a51ad6f1c31a3b2c701007ebb4f
Merge branch 'master' into martin-t/okc2
mutators.cfg