4 Commits

Author	SHA1	Message	Date
mshabunin	3ed89a8879	Merge with master and fix conflicts	2014-08-13 18:24:11 +04:00
Sergei Nikulov	eaec132091	#2992: update after review	2014-07-30 00:03:41 +04:00
Sergey Nikulov	bd144cfa64	upmerged pull req #2974 to master - added more jpeg options to imgcodecs	2014-07-21 18:56:35 +04:00
vbystricky	4286f60387	Extract imgcodecs module from highgui	2014-07-07 16:28:08 +04:00