Roman Donchenko d58cd9851f Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: CMakeLists.txt cmake/OpenCVDetectCUDA.cmake doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst modules/core/src/cmdparser.cpp modules/gpu/CMakeLists.txt modules/gpu/doc/introduction.rst modules/gpu/perf/perf_video.cpp modules/highgui/doc/reading_and_writing_images_and_video.rst modules/ocl/src/cl_context.cpp modules/video/include/opencv2/video/background_segm.hpp samples/cpp/image_sequence.cpp samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp samples/python/chessboard.py samples/python/cvutils.py samples/python/demhist.py samples/python/dft.py samples/python/distrans.py samples/python/edge.py samples/python/ffilldemo.py samples/python/fitellipse.py samples/python/houghlines.py samples/python/inpaint.py samples/python/logpolar.py samples/python/morphology.py samples/python/numpy_array.py samples/python/watershed.py		2013-12-03 17:35:21 +04:00
..
pics	Merge remote-tracking branch 'upstream/master'	2013-09-26 23:08:23 +10:00
feature_detection.rst	fixed description of createLineSegmentDetector	2013-09-30 15:07:32 +04:00
filtering.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-11-11 16:55:36 +04:00
geometric_transformations.rst	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
histograms.rst	Merge pull request #1248 from vkocheganov:chi_square_alt	2013-08-28 11:44:41 +04:00
imgproc.rst	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00
miscellaneous_transformations.rst	Normalized file endings.	2013-08-21 18:59:25 +04:00
motion_analysis_and_object_tracking.rst	Remove documentation for old python wrapper	2013-04-12 19:37:40 +04:00
object_detection.rst	Normalized file endings.	2013-08-21 18:59:25 +04:00
structural_analysis_and_shape_descriptors.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-03 17:35:21 +04:00