From: terencehill <piuntn@gmail.com>
Date: Sat, 19 Feb 2022 17:57:42 +0000 (+0000)
Subject: Merge branch 'bones_was_here/imagejank' into 'master'
X-Git-Tag: xonotic-v0.8.5~195
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6cf5567258933c37b27da5ae2d01dd1a3a47df80;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'bones_was_here/imagejank' into 'master'

Work around imagemagick regression that puts everything upside down

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

6cf5567258933c37b27da5ae2d01dd1a3a47df80