mshabunin 3ed89a8879 Merge with master and fix conflicts		2014-08-13 18:24:11 +04:00
..
imgcodecs
imgcodecs.hpp	Merge with master and fix conflicts	2014-08-13 18:24:11 +04:00