]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/GunGame
authorLyberta <lyberta@lyberta.net>
Mon, 16 Jul 2018 12:21:20 +0000 (15:21 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 16 Jul 2018 12:21:20 +0000 (15:21 +0300)
commit60019c9fb1bf3b566703615b35533d4d0c5e272a
tree98e9d0d6132ef25d2176773c22ab22519dcd9340
parent1438649ceea63fe4e4cfecb02335c0bc0adf6ef3
parentaa1c87cd3f79ddaf4e45ebf9428293cfdf2d6733
Merge branch 'master' into Lyberta/GunGame
gamemodes-server.cfg
qcsrc/client/hud/panel/modicons.qc
qcsrc/common/notifications/all.inc
qcsrc/server/g_world.qc