]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/AMMO
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 2 Sep 2019 21:15:35 +0000 (23:15 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 2 Sep 2019 21:15:35 +0000 (23:15 +0200)
commita98dd9ddfc5de8bbd5937e7937bb9a43b1d67501
tree84df6fac8b63ca713bbf978f7a20a1901586c5dc
parent590a5297bd4ad3b00dde7efc20d6cc860be4f853
parentb4e34b1127c172aa0617988ea8ed22a1c0ce9feb
Merge branch 'master' into martin-t/AMMO
xonotic-server.cfg