Stephen Mather e1ebc79827 resolve merge conflict from master ... Former-commit-id: 2b83086c20		2019-03-27 14:02:35 +00:00
..
cmake	Fixed broken Exiv2lib archive URL	2019-03-02 18:51:42 -05:00
CMakeLists.txt	resolve merge conflict from master	2019-03-27 14:02:35 +00:00