Roman Donchenko 3d7a457c97 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: doc/tutorials/introduction/linux_install/linux_install.rst modules/core/doc/operations_on_arrays.rst modules/core/include/opencv2/core/core.hpp modules/core/src/system.cpp modules/gpu/src/cuda/resize.cu modules/imgproc/doc/miscellaneous_transformations.rst modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst modules/video/src/bgfg_gaussmix2.cpp		2014-05-19 18:39:20 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-04-28 12:08:21 +04:00
include/opencv2	added jpeg with optimized coding support.	2014-03-27 13:34:33 -04:00
perf	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-05-19 18:39:20 +04:00
test	cv2cvtest part2	2014-04-09 13:08:51 +04:00
CMakeLists.txt	Merge pull request #1986 from GregoryMorse:patch-3	2014-03-18 16:18:33 +04:00