Roman Donchenko
464a010f53
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/include/opencv2/core/operations.hpp
modules/core/include/opencv2/core/version.hpp
modules/core/src/gpumat.cpp
modules/cudaimgproc/src/color.cpp
modules/features2d/src/orb.cpp
modules/imgproc/src/samplers.cpp
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
samples/ocl/facedetect.cpp
2013-12-10 12:51:00 +04:00
..
2013-09-26 14:04:11 +08:00
2013-11-05 23:53:51 +04:00
2013-12-06 09:31:18 -02:00
2013-09-26 14:04:11 +08:00
2013-11-11 16:55:36 +04:00
2013-11-19 16:21:09 +04:00
2013-11-05 23:53:51 +04:00
2013-10-08 15:23:18 +02:00
2013-11-06 20:02:31 +04:00
2013-10-01 15:57:33 +04:00
2013-09-26 14:04:11 +08:00
2013-10-08 16:49:20 +02:00
2013-10-03 23:26:06 +04:00
2013-11-11 18:00:55 +04:00