Laurent Rineau 2766e1ff5d Merge 'master' and fix conflicts

2018-05-28 16:40:09 +02:00

..

analyze_impl.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

analyze.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

bmp_impl.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

bmp.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

bmpendian_impl.h

Fix warnings

2018-05-15 15:13:05 +02:00

bmpendian.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

bmpread_impl.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

bmpread.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

bmptypes.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

convert_impl.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

convert.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

fgetns_impl.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

fgetns.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

gif_impl.h

Undef the macros at the end, as they are not identical (one has an EXPORT)

2018-05-23 11:48:58 +02:00

gif.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

gis_impl.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

gis.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

inr_impl.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

inr.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

iris_impl.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

iris.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

mincio_impl.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

mincio.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

pnm_impl.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

pnm.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

recbuffer_impl.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

recbuffer.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

recline_impl.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

recline.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

reech4x4_impl.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

reech4x4.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00

typedefs.h

add SPDX identifier for files under the LGPL-3+ license

2017-11-12 10:17:50 +01:00