Merge branch 'master' of https://github.com/Itseez/opencv into gdal_lan
authoredgarriba <edgar.riba@gmail.com>
Sat, 31 Oct 2015 19:18:41 +0000 (20:18 +0100)
committeredgarriba <edgar.riba@gmail.com>
Sat, 31 Oct 2015 19:18:41 +0000 (20:18 +0100)
commita242556b1dff26ff9f3adf9240fe39ca3efdb10c
tree212ae51a5dfa25b38d731e4748d3d7be94e939b9
parentdecdae515b4a4ff6bf125d857754775d9e64c40f
parent6e2a68fdf349d0347cc04b399c49f3362b684fbc
Merge branch 'master' of https://github.com/Itseez/opencv into gdal_lan

Conflicts:
modules/imgcodecs/include/opencv2/imgcodecs.hpp
modules/imgcodecs/include/opencv2/imgcodecs.hpp
modules/imgcodecs/src/loadsave.cpp