]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/CA_forbidspawn
authorterencehill <piuntn@gmail.com>
Sun, 4 Sep 2016 10:11:10 +0000 (12:11 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 4 Sep 2016 10:11:10 +0000 (12:11 +0200)
1  2 
qcsrc/server/command/cmd.qc

Simple merge