]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Thu, 29 Jun 2017 11:54:00 +0000 (14:54 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 29 Jun 2017 11:54:00 +0000 (14:54 +0300)
commit6cf0f285e8ab03dfacf9ca27c5ff972db1247c86
tree4869e401f988816d9351c7f1223fcc29c50e0fe2
parent88293e677e5182620510fa3f6dea3903ae1f5cc0
parentacddeee8ad8acd0099fdd25d5049e302d6246f24
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
qcsrc/client/hud/panel/modicons.qc
qcsrc/common/notifications/all.inc
qcsrc/common/stats.qh
qcsrc/common/t_items.qc
qcsrc/server/autocvars.qh
qcsrc/server/client.qc
qcsrc/server/g_world.qc
qcsrc/server/player.qc