]> 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: 9342bdb 2f215c6)
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Fri, 7 Apr 2017 13:14:16 +0000 (16:14 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 7 Apr 2017 13:14:16 +0000 (16:14 +0300)

Trivial merge