]> 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: 2fe686c 888747d)
Merge branch 'Lyberta/sev/OKSuperweaponIcons' into 'master'
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 30 Jul 2018 23:46:29 +0000 (23:46 +0000)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 30 Jul 2018 23:46:29 +0000 (23:46 +0000)
Updated OK superweapons icons (compatible)

See merge request xonotic/xonotic-data.pk3dir!582


Trivial merge