opencv/samples/cpp/tutorial_code/ImgProc
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
..
AddingImages.cpp Build tutorial codes together with other samples 2012-11-09 10:15:48 +04:00
BasicLinearTransforms.cpp Build tutorial codes together with other samples 2012-11-09 10:15:48 +04:00
Morphology_1.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Morphology_2.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
Pyramids.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
Smoothing.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Threshold.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00