Roman Donchenko fee2ed37fc Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	modules/contrib/src/retina.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/src/algorithm.cpp
	modules/core/src/arithm.cpp
	modules/features2d/src/features2d_init.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/imgproc/src/generalized_hough.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/video/src/tvl1flow.cpp
	modules/video/src/video_init.cpp

2014-01-14 11:53:59 +04:00

..

haartraining

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-01-14 11:53:59 +04:00

sft

War on Whitespace, master edition: file endings.

2013-08-27 14:23:26 +04:00

traincascade

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-10 12:51:00 +04:00

CMakeLists.txt

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-10-22 14:28:00 +04:00