]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/ca_arena_freezetag_bugfixes
authorterencehill <piuntn@gmail.com>
Fri, 8 Feb 2013 13:48:10 +0000 (14:48 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 8 Feb 2013 13:48:10 +0000 (14:48 +0100)
1  2 
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc
qcsrc/server/progs.src
qcsrc/server/teamplay.qc

Simple merge
Simple merge
Simple merge
Simple merge