]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'martin-t/okc' into martin-t/okc3
authorMartin Taibr <taibr.martin@gmail.com>
Thu, 24 Aug 2017 23:19:47 +0000 (01:19 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Thu, 24 Aug 2017 23:19:47 +0000 (01:19 +0200)
1  2 
defaultServer.cfg

Simple merge