]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 834ce28 85cfcd0)
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Tue, 6 Feb 2018 14:56:00 +0000 (17:56 +0300)
committerLyberta <lyberta@lyberta.net>
Tue, 6 Feb 2018 14:56:00 +0000 (17:56 +0300)

Trivial merge