]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into TimePath/gametypes/infection
authorChristopher Bock <bockchristopher@live.de>
Wed, 18 May 2016 11:48:33 +0000 (13:48 +0200)
committerChristopher Bock <bockchristopher@live.de>
Wed, 18 May 2016 11:48:33 +0000 (13:48 +0200)
commit61e0dfffc707889d1db1ee2d6836a5f5edf35583
tree35632a391d77b0dc4ca36597ce2ad033c3ce862b
parent1f3cb31d3accbc4bbe1ed58fea8528ee141f16cf
parentbf396381b13da7693c4bcca3b74848186ec1c680
Merge remote-tracking branch 'origin/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