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-03-24 19:02:16 +04:00
2013-12-03 17:35:21 +04:00
2014-05-19 18:39:20 +04:00
2013-08-21 18:59:24 +04:00
2014-04-23 17:30:27 +00:00
2014-03-18 08:59:53 +01:00
2014-04-03 14:53:27 +04:00
2013-08-27 13:26:44 +04:00
2014-04-23 17:30:27 +00:00
2014-03-24 12:53:30 +04:00
2012-08-07 14:30:36 +04:00
2014-04-03 14:53:27 +04:00