]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Mon, 16 Jul 2018 12:28:10 +0000 (15:28 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 16 Jul 2018 12:28:10 +0000 (15:28 +0300)
1  2 
gamemodes-server.cfg
qcsrc/client/hud/panel/modicons.qc
qcsrc/common/notifications/all.inc
qcsrc/server/g_world.qc

Simple merge
Simple merge
Simple merge
Simple merge