Merge with master and fix conflicts
authormshabunin <maksim.shabunin@itseez.com>
Wed, 13 Aug 2014 14:24:11 +0000 (18:24 +0400)
committermshabunin <maksim.shabunin@itseez.com>
Wed, 13 Aug 2014 14:24:11 +0000 (18:24 +0400)
commit3ed89a88796f6c21ba356cb4b5f931544e049b4a
treee21bd7e3a37c1d3b0fe3d6c4d90fd7b7c0c2891d
parent67e23ed972ec2f8bc5451e9ba10c046d644c4bd1
parent12c69ad490db8631e39a9c4be61d29f57735abea
Merge with master and fix conflicts
CMakeLists.txt
cmake/templates/cvconfig.h.in
modules/imgcodecs/CMakeLists.txt
modules/imgcodecs/include/opencv2/imgcodecs.hpp
modules/imgcodecs/src/grfmt_gdal.cpp
modules/imgcodecs/src/grfmt_gdal.hpp
modules/imgcodecs/src/grfmts.hpp
modules/imgcodecs/src/loadsave.cpp