]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/CA_forbidspawn
authorterencehill <piuntn@gmail.com>
Wed, 31 Aug 2016 12:15:20 +0000 (14:15 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 31 Aug 2016 12:15:20 +0000 (14:15 +0200)
1  2 
qcsrc/server/client.qc
qcsrc/server/command/cmd.qc

Simple merge
Simple merge