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
..
doc	Normalized file endings.	2013-08-21 18:59:25 +04:00
include/opencv2	renamed gpu headers (made it more consistent)	2013-06-10 12:40:30 +04:00
perf	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-19 19:02:36 +04:00
src	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
test	Merge pull request #1297 from SpecLad:merge-2.4	2013-08-20 14:10:22 +04:00
CMakeLists.txt	Revert "Revert "Merge pull request #836 from jet47:gpu-modules""	2013-06-07 13:05:39 +04:00