]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'martin-t/ok-config' into martin-t/master2
authorMartin Taibr <taibr.martin@gmail.com>
Thu, 15 Aug 2019 10:09:55 +0000 (12:09 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Thu, 15 Aug 2019 10:09:55 +0000 (12:09 +0200)
1  2 
bal-wep-xonotic.cfg

Simple merge