]> de.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: f41f81f 305b094)
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Thu, 5 Apr 2018 03:10:51 +0000 (06:10 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 5 Apr 2018 03:10:51 +0000 (06:10 +0300)

Trivial merge