]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit22032ebee9cbad60d868cda1e6704a73583704e0
tree2f61cef98fbb5daf95601c2f8a9f2a030abd4671
parent01ff3b538bbf009cbc044338667f31dabb17b416
parent29eae05bde2bd8bfd4c36e619ed8852e5f9a22c8
Merge branch 'martin-t/okc' into martin-t/okc3
defaultServer.cfg