3 Commits

Author	SHA1	Message	Date
mshabunin	3ed89a8879	Merge with master and fix conflicts	2014-08-13 18:24:11 +04:00
Alexander Alekhin	55188fe991	world fix	2014-08-05 20:12:35 +04:00
vbystricky	4286f60387	Extract imgcodecs module from highgui	2014-07-07 16:28:08 +04:00