]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/arena_and_ca_fixes
authorterencehill <piuntn@gmail.com>
Fri, 6 Jan 2012 23:32:48 +0000 (00:32 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 6 Jan 2012 23:32:48 +0000 (00:32 +0100)
1  2 
qcsrc/server/cl_client.qc

Simple merge