Roman Donchenko
78be4f66f7
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
CMakeLists.txt
modules/calib3d/src/calibration.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/adaptive_bilateral_filter.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/clahe.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
2013-10-28 13:38:25 +04:00
..
2013-09-05 18:26:43 +04:00
2013-09-09 14:02:05 +04:00
2013-09-05 19:03:00 +04:00
2013-10-28 13:38:25 +04:00
2013-10-08 12:46:43 +04:00
2012-02-03 11:26:49 +00:00