]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/ca_fixes
authorterencehill <piuntn@gmail.com>
Thu, 30 Jan 2014 00:58:16 +0000 (01:58 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 30 Jan 2014 00:58:16 +0000 (01:58 +0100)
1  2 
qcsrc/server/command/cmd.qc

Simple merge