Roman Donchenko d67b450741 Merge pull request #2378 from ngryman:progressive_jpeg		2014-03-26 12:12:02 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-24 19:02:16 +04:00
include/opencv2	Merge pull request #2378 from ngryman:progressive_jpeg	2014-03-26 12:12:02 +04:00
perf	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
src	Merge pull request #2378 from ngryman:progressive_jpeg	2014-03-26 12:12:02 +04:00
test	Merge pull request #2378 from ngryman:progressive_jpeg	2014-03-26 12:12:02 +04:00
CMakeLists.txt	Merge pull request #1986 from GregoryMorse:patch-3	2014-03-18 16:18:33 +04:00