opencv/samples/cpp/tutorial_code
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
..
bioinspired retina included in namespace bioinspired + followed suggestions made by Vadim 2013-07-14 19:28:37 +02:00
calib3d Move C API of opencv_calib3d to separate file 2013-04-11 21:00:17 +04:00
core Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
features2D Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
gpu/gpu-basics-similarity Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
HighGUI Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Histograms_Matching Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
images Erasing two images from cpp/tutorial folder 2011-11-03 06:09:31 +00:00
ImgProc Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
ImgTrans Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
introduction Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
ml Normalized file endings. 2013-08-21 18:59:25 +04:00
objectDetection rebased commits 2013-08-22 18:40:30 +02:00
ShapeDescriptors Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
TrackingMotion Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00