mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-28 21:20:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
4f19216e45
opencv/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
..
_static removed obsolete docs 2011-05-09 16:20:46 +00:00
_themes/blue Remove documentation for old python wrapper 2013-04-12 19:37:40 +04:00
pattern_tools Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
tutorials Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
user_guide Merge branch '2.4' 2013-01-25 16:30:36 +04:00
vidsurv "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00
acircles_pattern.png propagated some more changes from 2.3 to trunk 2011-06-23 12:15:35 +00:00
check_docs2.py fixed documentation build 2013-06-10 15:52:01 +04:00
check_docs_whitelist.txt updated whitelist 2011-07-08 14:34:03 +00:00
check_docs.py Merge branch '2.4' 2013-04-12 15:35:38 +04:00
CMakeLists.txt android -> plarforms/android 2013-05-27 11:10:38 +04:00
conf.py android -> plarforms/android 2013-05-27 11:10:38 +04:00
Doxyfile.in Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
haartraining.htm "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00
license.txt minor in license file 2012-08-07 13:22:41 +04:00
mymath.sty moved the new docs from docroot to doc 2011-05-09 16:34:47 +00:00
ocv.py Remove documentation for old python wrapper 2013-04-12 19:37:40 +04:00
opencv_cheatsheet.tex Fixed cheatsheet for loop (bug #2701) 2013-01-28 18:41:59 +04:00
opencv-logo2.png "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00
opencv-logo-white.png merged revisions r7802,r7804,r7805 from 2.4 branch 2012-04-03 00:33:33 +00:00
opencv-logo.png "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00
opencv.bib added documentation on LatentSVM algorithm 2011-04-03 10:16:28 +00:00
opencv.ico remove interfaces from installation; remove opencv/utils dir completely 2010-12-03 22:55:08 +00:00
opencv.jpg "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00
packaging.txt Normalize whitespace in documentation and text files 2012-10-17 21:42:09 +04:00
patch_refman_latex.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
pattern.png replaced 8x6 pattern with 9x6, which orientation can be determined without any ambiguity 2010-12-13 15:00:35 +00:00
reformat.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00