]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/GunGame
authorLyberta <lyberta@lyberta.net>
Sun, 10 Jun 2018 08:13:53 +0000 (11:13 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 10 Jun 2018 08:13:53 +0000 (11:13 +0300)
commita22cbff0e1d4a93141e02410f27d0db78d72139d
tree9b84e4bf58e27daa3dd05fd2c65bd2fda7188147
parent8bc28937bd6cfd9b20587ad96f5b9ce490ef3a09
parent94f293de630d6173c5303adf65e45d4f4a83863a
Merge branch 'master' into Lyberta/GunGame
gamemodes-server.cfg
qcsrc/client/hud/panel/modicons.qc
qcsrc/common/gamemodes/gamemode/_mod.inc
qcsrc/common/gamemodes/gamemode/_mod.qh
qcsrc/server/g_world.qc