mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-11 22:59:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
4d2ea847fa
opencv/modules/core/doc
History
Roman Donchenko 13cd0a0502 Merge remote-tracking branch 'origin/2.4' 
Original pull requests:
	#996 from jet47:gpu-nvcuvid-libraries
	#995 from jet47:fix-bug-2985
	#999 from snosov1:unreliable-results-fix
	#1005 from alekcac:doc_fix
	#1004 from jet47:fix-bug-3068
	#987 from jet47:bug-3085-fix
	#969 from pengx17:2.4_binary_cache
	#929 from dominikrose:mingw-libdc1394-2-windows
	#1000 from ivan-korolev:fix_sift_bug_2892
	#1001 from ivan-korolev:fix_stitching_bug_2405
	#998 from asmorkalov:android_cmake_mips_fix
	#993 from ivan-korolev:fix_videostab_bug_3023
	#988 from snosov1:3071-fix
	#986 from pengx17:2.4_initiated_context
	#982 from pengx17:2.4_fix_two_bugs
	#981 from SeninAndrew:ximea_camera_support_fix
	#991 from asmorkalov:android_javadoc_fix
	#972 from jet47:mog2-params-bug-2168
	#980 from SpecLad:include-config
	#973 from pengx17:2.4_oclclahe
	#903 from aks2:2.4
	#968 from asmorkalov:android_na_cproj_fix
	#971 from SpecLad:matchers-ctor
	#970 from asmorkalov:dshow_valid_check_fix
	#965 from apavlenko:fix_java_empty_mats

Conflicts:
	cmake/OpenCVModule.cmake
	modules/core/src/matmul.cpp
	modules/gpu/CMakeLists.txt
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/stitching/src/matchers.cpp
	modules/video/src/video_init.cpp
	modules/videostab/src/global_motion.cpp
2013-06-19 15:25:37 +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' 2013-06-19 15:25:37 +04:00
clustering.rst Remove documentation for old python wrapper 2013-04-12 19:37:40 +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 Fix drawing documentation referring to C API macros 2013-05-20 10:56:06 +01: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 Updated documentation to new "COLOR_" format for color conversion enums. 2013-06-05 21:59:01 -04:00
utility_and_system_functions_and_macros.rst Remove documentation for old python wrapper 2013-04-12 19:37:40 +04:00
xml_yaml_persistence.rst Update documentation 2013-03-22 22:14:54 +04:00