]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into LegendaryGuard/cyber
authorLegendaryGuard <rootuser999@gmail.com>
Tue, 10 Aug 2021 17:13:34 +0000 (19:13 +0200)
committerLegendaryGuard <rootuser999@gmail.com>
Tue, 10 Aug 2021 17:13:34 +0000 (19:13 +0200)
commitfa5be828e1615d2ae3d9637c0f7ffe53aa5454bc
tree1a13c724031440aede6dfa6aebc9246ab8073c30
parentadf5663fe76e4c25ea6ee2b3af1652a8f6686719
parent32fbad10d54c4b04d77a308696e3ab4f2c661cc3
Merge branch 'master' into LegendaryGuard/cyber
qcsrc/common/weapons/weapon/electro.qc