]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'martin-t/okc3' into martin-t/master
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 3 Sep 2017 19:14:34 +0000 (21:14 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 3 Sep 2017 19:14:34 +0000 (21:14 +0200)
commita660fac7921ee07350df0c54f87e2ebf67c7da9f
tree5f9cdc285397f145946361c0a75590493fe27e86
parentf817ef565e2a6e4ba98184e16ff34d6dabc615a7
parent2685e55bc4c47311b003f6ef4fc527aff2d189b3
Merge branch 'martin-t/okc3' into martin-t/master
qcsrc/server/sv_main.qc