]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into TimePath/gametypes/infection
authorTimePath <andrew.hardaker1995@gmail.com>
Wed, 21 Jan 2015 06:17:46 +0000 (17:17 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Wed, 21 Jan 2015 06:17:46 +0000 (17:17 +1100)
commitc83334e374466fbd102006591354f42c09aa309f
treeed3773e311422b6750ace6e25989f56459e2b17f
parentde54147023ede356f98ccc26a17259f82afeb5b7
parentdcf8a85693db60468fde21e1eaa64043576edb0d
Merge branch 'master' into TimePath/gametypes/infection
qcsrc/client/hud.qc
qcsrc/common/mapinfo.qc
qcsrc/server/cl_player.qc
qcsrc/server/g_damage.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/mutators/mutators_include.qc
qcsrc/server/teamplay.qc