]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/g_changeteam_banned_fix
authorterencehill <piuntn@gmail.com>
Wed, 23 Nov 2011 16:05:01 +0000 (17:05 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 23 Nov 2011 16:05:01 +0000 (17:05 +0100)
1  2 
qcsrc/server/clientcommands.qc

Simple merge