opencv/modules/superres/src
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
..
cuda Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00
opencl Normalized file endings. 2013-08-21 18:59:25 +04:00
btv_l1_gpu.cpp refactored Separable Linear Filters 2013-06-14 17:25:56 +04:00
btv_l1_ocl.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
btv_l1.cpp Merge branch '2.4' 2013-03-29 19:38:35 +04:00
frame_source.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-16 11:52:41 +04:00
input_array_utility.cpp Merge pull request #1122 from SpecLad:merge-2.4 2013-07-21 18:46:27 +04:00
input_array_utility.hpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-16 11:52:41 +04:00
optical_flow.cpp Normalized file endings. 2013-08-21 18:59:25 +04:00
precomp.hpp Merge pull request #1110 from SpecLad:config-cleanup 2013-07-30 17:39:35 +04:00
ring_buffer.hpp updated license header in whole gpu module 2013-03-22 14:03:15 +04:00
super_resolution.cpp Merge branch '2.4' 2013-03-29 19:38:35 +04:00