]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into martin-t/weapon-priority
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 8 Oct 2019 10:36:52 +0000 (12:36 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 8 Oct 2019 10:36:52 +0000 (12:36 +0200)
1  2 
xonotic-client.cfg

Simple merge