opencv/modules/core/doc
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
..
pics merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
basic_structures.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-17 14:14:07 +04:00
clustering.rst Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
command_line_parser.rst War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
core.rst Added IPP Async converters, doc and sample 2014-04-01 16:47:29 +04:00
drawing_functions.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-19 18:39:20 +04:00
dynamic_structures.rst Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
intro.rst Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
ipp_async_converters.rst Added SharedMatrix 2014-04-03 14:53:27 +04:00
old_basic_structures.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-31 14:42:00 +04:00
old_xml_yaml_persistence.rst Remove documentation for old python wrapper 2013-04-12 19:37:40 +04:00
opengl_interop.rst Merge branch 'master' into gpu-cuda-rename 2013-09-09 12:57:35 +04:00
operations_on_arrays.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-19 18:39:20 +04:00
utility_and_system_functions_and_macros.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-03 19:53:21 +04:00
xml_yaml_persistence.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00