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
..
adding_images	Deleted all trailing whitespace.	2013-08-21 18:59:24 +04:00
basic_geometric_drawing	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-03 17:35:21 +04:00
basic_linear_transform	Deleted all trailing whitespace.	2013-08-21 18:59:24 +04:00
discrete_fourier_transform	Deleted all trailing whitespace.	2013-08-21 18:59:24 +04:00
file_input_output_with_xml_yml	Normalized file endings.	2013-08-21 18:59:25 +04:00
how_to_scan_images	Deleted all trailing whitespace.	2013-08-21 18:59:24 +04:00
interoperability_with_OpenCV_1	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
mat_the_basic_image_container	Added typo in docs of tutorial	2013-09-13 15:01:18 +02:00
mat-mask-operations	Deleted all trailing whitespace.	2013-08-21 18:59:24 +04:00
random_generator_and_text	svn repository web references are replaced with links to git	2012-08-07 14:30:36 +04:00
table_of_content_core	Normalized file endings.	2013-08-21 18:59:25 +04:00