edgarriba a242556b1d Merge branch 'master' of https://github.com/Itseez/opencv into gdal_lan
Conflicts:
	modules/imgcodecs/include/opencv2/imgcodecs.hpp
2015-10-31 20:18:41 +01:00
..
2015-10-13 17:34:08 +03:00
2015-09-14 12:15:56 +03:00
2015-10-23 21:42:11 +02:00
2015-10-22 23:27:55 +02:00
2015-03-02 18:13:00 +03:00
2015-10-29 11:28:12 +03:00
2015-06-05 16:30:36 +03:00
2014-08-05 20:12:35 +04:00