]> 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: 2691ea0 aa1c87c)
Merge branch 'master' into Lyberta/AssaultIcons 576/head
authorLyberta <lyberta@lyberta.net>
Mon, 16 Jul 2018 12:19:34 +0000 (15:19 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 16 Jul 2018 12:19:34 +0000 (15:19 +0300)

Trivial merge