Roman Donchenko
cc05493730
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVModule.cmake
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCVConfig.cmake.in
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
modules/cudabgsegm/src/cuda/mog.cu
modules/imgproc/perf/opencl/perf_filters.cpp
modules/imgproc/src/opencl/filterSep_singlePass.cl
modules/nonfree/CMakeLists.txt
modules/nonfree/perf/perf_precomp.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/opencl/bgfg_mog.cl
modules/superres/CMakeLists.txt
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/cuda/btv_l1_gpu.cu
modules/superres/src/frame_source.cpp
modules/superres/src/input_array_utility.cpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
samples/gpu/CMakeLists.txt
samples/gpu/brox_optical_flow.cpp
samples/gpu/super_resolution.cpp
2014-03-24 19:02:16 +04:00
..
2013-11-17 20:34:50 +01:00
2013-11-19 16:21:09 +04:00
2013-12-17 13:53:59 +04:00
2013-12-03 17:35:21 +04:00
2013-11-19 16:21:09 +04:00
2014-03-24 19:02:16 +04:00
2011-11-03 06:09:31 +00:00
2014-01-07 02:52:30 +04:00
2013-12-03 17:35:21 +04:00
2013-11-26 15:05:26 +04:00
2013-12-16 11:05:53 +01:00
2013-11-17 20:34:50 +01:00
2013-09-26 19:02:35 +04:00
2013-11-19 16:21:09 +04:00
2013-11-17 20:34:50 +01:00
2013-09-01 22:13:49 +02:00
2014-01-21 02:15:37 +04:00