]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into TimePath/gametypes/infection
authorTimePath <andrew.hardaker1995@gmail.com>
Wed, 2 Dec 2015 04:29:15 +0000 (15:29 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Wed, 2 Dec 2015 04:29:41 +0000 (15:29 +1100)
commit3cf0ec118cf3094b0614dc125fc1d7a07bbeaeb1
tree8e769595facacef8ed0997636ff01c9a45c4b094
parent9eee506cf7049afe48fcdfe88b259757955234e5
parenta853ff36bca341c4a328f97485d3b502efccc73d
Merge branch 'master' into TimePath/gametypes/infection

# Conflicts:
# qcsrc/client/hud.qc
# qcsrc/server/cl_player.qc
# qcsrc/server/mutators/mutators.qh
# qcsrc/server/mutators/mutators_include.qc
# qcsrc/server/teamplay.qc
gamemodes.cfg
qcsrc/client/hud/panel/modicons.qc
qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh
qcsrc/menu/xonotic/util.qc
qcsrc/server/mutators/all.inc
qcsrc/server/mutators/mutator/gamemode_infection.qc