Roman Donchenko a3bde36c84 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/calib3d/include/opencv2/calib3d/calib3d.hpp modules/contrib/doc/facerec/facerec_api.rst modules/contrib/include/opencv2/contrib/contrib.hpp modules/contrib/src/facerec.cpp modules/core/include/opencv2/core/mat.hpp modules/features2d/include/opencv2/features2d/features2d.hpp modules/highgui/src/loadsave.cpp modules/imgproc/src/pyramids.cpp modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp modules/python/src2/gen.py modules/python/test/test.py modules/superres/test/test_superres.cpp samples/cpp/facerec_demo.cpp		2014-07-08 14:33:56 +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-07-08 14:33:56 +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