opencv/samples/cpp/tutorial_code/ImgTrans
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
..
CannyDetector_Demo.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
copyMakeBorder_demo.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
filter2D_demo.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Geometric_Transforms_Demo.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
HoughCircle_Demo.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
HoughLines_Demo.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Laplace_Demo.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Remap_Demo.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Sobel_Demo.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00