mshabunin 3ed89a8879 Merge with master and fix conflicts		2014-08-13 18:24:11 +04:00
..
imgcodecs	#2992: update after review	2014-07-30 00:03:41 +04:00
imgcodecs.hpp	Merge with master and fix conflicts	2014-08-13 18:24:11 +04:00