Merge remote-tracking branch 'origin/2.4' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 15 Jul 2013 14:40:54 +0000 (18:40 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Tue, 16 Jul 2013 07:52:41 +0000 (11:52 +0400)
commitfeaa12a27497ae46701358ff09d18bb8e39a041a
treecf60246e8e8af722dc4d271406f8618e6897b3df
parent52a9378257f5c059f122c6b5c12f91a918c8a1d8
parent886c009da6564296dd58a31919c2e676225705df
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
modules/core/include/opencv2/core/version.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/initialization.cpp
modules/ocl/test/main.cpp
modules/superres/CMakeLists.txt
modules/superres/src/input_array_utility.cpp
modules/superres/src/input_array_utility.hpp
modules/superres/src/optical_flow.cpp
24 files changed:
modules/core/doc/xml_yaml_persistence.rst
modules/features2d/src/brisk.cpp
modules/highgui/src/cap.cpp
modules/imgproc/src/templmatch.cpp
modules/ocl/include/opencv2/ocl.hpp
modules/ocl/src/gftt.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_kmeans.cpp
modules/ocl/test/test_moments.cpp
modules/ocl/test/test_objdetect.cpp
modules/superres/CMakeLists.txt
modules/superres/include/opencv2/superres.hpp
modules/superres/include/opencv2/superres/optical_flow.hpp
modules/superres/perf/perf_superres_ocl.cpp
modules/superres/src/btv_l1_ocl.cpp
modules/superres/src/frame_source.cpp
modules/superres/src/input_array_utility.cpp
modules/superres/src/input_array_utility.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_superres.cpp
modules/ts/include/opencv2/ts.hpp