]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
1  2 
qcsrc/server/sv_main.qc

Simple merge