]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Tue, 22 Aug 2017 20:00:35 +0000 (23:00 +0300)
committerLyberta <lyberta@lyberta.net>
Tue, 22 Aug 2017 20:00:35 +0000 (23:00 +0300)

Trivial merge