Roman Donchenko 2c4bbb313c Merge commit '43aec5ad' into merge-2.4 ...

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py

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

..

android

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

calib3d

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

2013-06-25 15:55:52 +04:00

core

Merge remote-tracking branch 'origin/2.4'

2013-08-06 13:56:49 +04:00

features2d

Merge branch '2.4'

2013-04-05 21:11:59 +04:00

highgui

Test execution inside Eclipse fixed;

2012-11-20 10:45:46 +04:00

imgproc

Merge commit '43aec5ad' into merge-2.4

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

ml

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

objdetect

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

photo

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

utils

Move cv::KeyPoint and cv::DMatch to core

2013-03-26 16:08:43 +04:00

video

merged all the latest changes from 2.4 to trunk

2012-04-13 21:50:59 +00:00

OpenCVTestCase.java

Move cv::KeyPoint and cv::DMatch to core

2013-03-26 16:08:43 +04:00

OpenCVTestRunner.java

Removed references to opencv.itseez.com

2013-06-28 12:48:12 +04:00