Merged master into upstream of libsdl2-image

[Manuel A. Fernandez Montecelo]

Hi,

I think that I messed up (or somebody did previously, unlikely) and
merged master into upstream for libsdl2-image.

So first, this is a warning so you perhaps should not pull from this
repository until this is fixed; and second to ask for help about how
to fix this.

Is there an easy and clean way to do this, without affecting people
who already pulled from this repository?

Cheers and sorry.
-- 
Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>