]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'martin-t/okc2' into martin-t/okc3
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 27 Aug 2017 00:32:34 +0000 (02:32 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 27 Aug 2017 00:32:34 +0000 (02:32 +0200)
commit5f03fdda245511e8f6239434b9b8f5fc62cdfae0
tree8c3368fd06f05c637d7b1c88ebab8d24fdb0f5e8
parent22032ebee9cbad60d868cda1e6704a73583704e0
parent1deb523af5f2edddb70ed34cbb0d4463f21d6cad
Merge branch 'martin-t/okc2' into martin-t/okc3
defaultServer.cfg