]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c04af5 9342bdb)
Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Fri, 7 Apr 2017 01:13:00 +0000 (04:13 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 7 Apr 2017 01:13:00 +0000 (04:13 +0300)

Trivial merge