]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'remotes/origin/master' into TimePath/gametypes/infection
authorTimePath <andrew.hardaker1995@gmail.com>
Wed, 13 May 2015 09:26:26 +0000 (19:26 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Wed, 13 May 2015 09:26:41 +0000 (19:26 +1000)
commitd8e2bdc317f7e183b762835bc0e30f8c423ab940
treee30696adbc42598b96e720bd5a9b256823303487
parentfbd2ff54a8b4066ef6696143ed443045de8a70ec
parent263c592e468eeeffb2755d204b21eb13e398adac
Merge remote-tracking branch 'remotes/origin/master' into TimePath/gametypes/infection

# Conflicts:
# qcsrc/common/mapinfo.qh
# qcsrc/server/bot/aim.qc
# qcsrc/server/bot/bot.qc
qcsrc/client/hud.qc
qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh
qcsrc/menu/xonotic/util.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