opencv/modules/core/doc
Roman Donchenko feaa12a274 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/core/include/opencv2/core/version.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/initialization.cpp
	modules/ocl/test/main.cpp
	modules/superres/CMakeLists.txt
	modules/superres/src/input_array_utility.cpp
	modules/superres/src/input_array_utility.hpp
	modules/superres/src/optical_flow.cpp
2013-07-16 11:52:41 +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 2013-07-03 19:53:21 +04:00
clustering.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-03 19:53:21 +04:00
command_line_parser.rst Update documentation 2013-03-22 22:14:54 +04:00
core.rst Revert "add new version of CommandLineParser. add empty docs" 2012-10-15 20:01:44 +04:00
drawing_functions.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-03 19:53:21 +04:00
dynamic_structures.rst Remove documentation for old python wrapper 2013-04-12 19:37:40 +04:00
intro.rst Updated documentation to new "COLOR_" format for color conversion enums. 2013-06-05 21:59:01 -04:00
old_basic_structures.rst Remove documentation for old python wrapper 2013-04-12 19:37:40 +04:00
old_xml_yaml_persistence.rst Remove documentation for old python wrapper 2013-04-12 19:37:40 +04:00
operations_on_arrays.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-03 19:53:21 +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-07-16 11:52:41 +04:00