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-09-30 14:39:17 +04:00
2013-12-06 15:20:29 +04:00
2013-08-27 13:26:44 +04:00
2014-02-14 12:21:35 +01:00
2011-10-06 12:37:53 +00:00
2013-04-21 23:04:54 +04:00
2010-11-30 10:09:08 +00:00
2011-08-15 13:18:01 +00:00
2013-12-06 15:20:29 +04:00
2013-08-21 18:59:25 +04:00
2013-10-08 12:46:43 +04:00
2010-11-29 13:31:52 +00:00
2014-02-03 12:55:03 +04:00
2013-10-08 12:46:43 +04:00