From: Mario <zacjardine@y7mail.com>
Date: Sat, 17 Feb 2018 06:04:58 +0000 (+0000)
Subject: Merge branch 'martin-t/diffs' into 'master'
X-Git-Tag: xonotic-v0.8.5~2302
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bebef6b9a1c5d5d79cb9cf11180dbb6cda6fcd29;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/diffs' into 'master'

Enable diffs for some image formats

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

bebef6b9a1c5d5d79cb9cf11180dbb6cda6fcd29