]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into martin-t/ok-config
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 13 Aug 2019 19:30:39 +0000 (21:30 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 13 Aug 2019 19:30:39 +0000 (21:30 +0200)
1  2 
bal-wep-xonotic.cfg

Simple merge