mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
fa5492343a
opencv/modules/core/doc
History
Roman Donchenko 3c4b24d531 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	modules/highgui/src/cap.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/imgproc.cpp
	samples/ocl/facedetect.cpp
2013-12-23 18:50:17 +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-12-03 17:35:21 +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 Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
drawing_functions.rst Merge remote-tracking branch 'upstream/2.4' into merge-2.4 2013-10-15 20:08:52 +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
old_basic_structures.rst Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +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 2013-12-23 18:50:17 +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