opencv

History

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

doc

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-05-19 18:39:20 +04:00

include/opencv2

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-05-19 18:39:20 +04:00

perf

Merge pull request #2684 from ElenaGvozdeva:ippiDFT

2014-05-07 17:57:17 +04:00

src

Merge remote-tracking branch 'origin/2.4' into merge-2.4