]> 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: 405f3ba 9181998)
Merge branch 'Lyberta/OffhandBlaster' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Sat, 17 Feb 2018 05:46:22 +0000 (08:46 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 17 Feb 2018 05:46:22 +0000 (08:46 +0300)

Trivial merge