]> 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: 26e5056 69ebfd5)
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Mon, 4 Dec 2017 18:29:04 +0000 (21:29 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 4 Dec 2017 18:29:04 +0000 (21:29 +0300)

Trivial merge