]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into TimePath/gametypes/infection
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 12 Mar 2016 05:34:48 +0000 (16:34 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 12 Mar 2016 05:59:47 +0000 (16:59 +1100)
commit1f3cb31d3accbc4bbe1ed58fea8528ee141f16cf
tree2e9b85f05e6e325592762cee95981706ca003c91
parent15e532da6c2d5ae9d9bafa4bdf84f50f002e9abd
parent0909c31be431cc41a7c872754385f865a42bbb21
Merge branch 'master' into TimePath/gametypes/infection
gamemodes.cfg
qcsrc/client/hud/panel/modicons.qc
qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh
qcsrc/menu/xonotic/util.qc
qcsrc/server/mutators/mutator/gamemode_infection.qc