Merge remote-tracking branch 'origin/2.4' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 2 Sep 2013 15:44:51 +0000 (19:44 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 2 Sep 2013 15:44:51 +0000 (19:44 +0400)
commit9218f4976ce01823c4e27eca6c8e93a208d12b26
treee1a6fcaa549819b929362c4463f703f02bf19f3d
parentfc37df05ecd7f164033b6398a5749c7d7604fb7b
parent99043f6fc203cf8c438029c04ce8677fb6c5ecdc
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
modules/contrib/src/retina.cpp
modules/gpu/perf/perf_video.cpp
modules/gpuoptflow/src/tvl1flow.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/precomp.hpp
samples/gpu/stereo_multi.cpp
20 files changed:
3rdparty/libtiff/CMakeLists.txt
modules/bioinspired/src/retina.cpp
modules/core/src/arithm.cpp
modules/core/src/stat.cpp
modules/gpuoptflow/perf/perf_optflow.cpp
modules/gpuoptflow/src/cuda/tvl1flow.cu
modules/gpuoptflow/src/tvl1flow.cpp
modules/highgui/src/grfmt_png.cpp
modules/imgproc/src/color.cpp
modules/imgproc/src/morph.cpp
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/precomp.hpp
modules/ocl/src/tvl1flow.cpp
samples/gpu/stereo_multi.cpp