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

..

_cvcommon.h

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

_cvhaartraining.h

Normalize line endings and whitespace

2012-10-17 15:32:23 +04:00

CMakeLists.txt

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

2013-10-15 20:08:52 +04:00

createsamples.cpp

Global CMake reorganization:

2012-02-03 11:26:49 +00:00

cvboost.cpp

Compile OpenCV with GCC visibility set to hidden

2013-05-13 18:33:20 +04:00

cvclassifier.h

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

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

cvcommon.cpp

Remove inline sorting algorithms from core headers

2013-03-28 17:22:50 +04:00

cvhaarclassifier.cpp

Merged the trunk r8589:8653 - all changes related to build warnings

2012-06-15 13:04:17 +00:00

cvhaartraining.cpp

Drop outdated definitions from internal.hpp

2013-04-01 15:24:35 +04:00

cvhaartraining.h

Normalize line endings and whitespace

2012-10-17 15:32:23 +04:00

cvsamples.cpp

Merged the trunk r8589:8653 - all changes related to build warnings

2012-06-15 13:04:17 +00:00

haartraining.cpp

Global CMake reorganization:

2012-02-03 11:26:49 +00:00

performance.cpp

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00