8 Commits

Author	SHA1	Message	Date
Laurent Rineau	2766e1ff5d	Merge 'master' and fix conflicts	2018-05-28 16:40:09 +02:00
Andreas Fabri	777d3057d9	Undef the macros at the end, as they are not identical (one has an EXPORT)	2018-05-23 11:48:58 +02:00
Laurent Rineau	fd49c82abd	Fix warnings	2018-05-15 15:13:05 +02:00
Sébastien Loriot	0698f79aff	add SPDX identifier for files under the LGPL-3+ license	2017-11-12 10:17:50 +01:00
Andreas Fabri	6042496f58	one more fallthrough	2016-10-18 11:13:59 +02:00
Andreas Fabri	c90f4bf978	more fallthrough statements	2016-10-17 13:45:42 +02:00
Clement Jamin	7ca2c758da	Fix warnings in CGAL_ImageIO	2016-07-01 11:27:54 +02:00
Guillaume Damiand	e715a25483	Move header files of ImageIO from directory CGAL_ImageIO/src/ to directory CGAL_ImageIO/include/CGAL/ImageIO/; update #include accordingly.	2016-06-28 19:18:53 +02:00