Roman Donchenko
3d7a457c97
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
doc/tutorials/introduction/linux_install/linux_install.rst
modules/core/doc/operations_on_arrays.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/gpu/src/cuda/resize.cu
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/video/src/bgfg_gaussmix2.cpp
2014-05-19 18:39:20 +04:00
..
2014-05-19 18:39:20 +04:00
2013-12-17 14:53:44 +09:00
2014-03-17 10:42:19 +04:00
2014-05-16 18:49:45 -04:00
2014-04-14 16:08:02 +04:00
2012-02-03 11:26:49 +00:00