opencv/modules/stitching/test
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
..
test_blenders.cpp Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
test_main.cpp Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
test_matchers.cpp Normalized file endings. 2013-08-21 18:59:25 +04:00
test_precomp.hpp Main module headers are moved 1 level up 2013-03-13 17:26:56 +04:00