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	Deleted all trailing whitespace.	2013-08-21 18:59:24 +04:00
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-05-19 18:39:20 +04:00
src	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
test	deleted excess semicolons, commas	2014-01-18 01:31:33 +04:00
CMakeLists.txt	Normalized file endings.	2013-08-21 18:59:25 +04:00