third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
bdfd29a0b8
opencv/doc
History
Roman Donchenko db85c35e69 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/basicretinafilter.hpp
	modules/contrib/src/magnoretinafilter.hpp
	modules/contrib/src/parvoretinafilter.hpp
	modules/contrib/src/retinacolor.hpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/highgui/src/cap_tyzx.cpp
	modules/ocl/perf/perf_filters.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/test/test_filters.cpp
	modules/ocl/test/test_objdetect.cpp
2014-03-03 13:45:22 +04:00
..
_static Normalized file endings. 2013-08-21 18:59:25 +04:00
_themes/blue Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
pattern_tools Normalized file endings. 2013-08-21 18:59:25 +04:00
py_tutorials Merge pull request #2291 from xgvargas:extra-note-for-waitKey 2014-02-19 14:33:58 +04:00
tutorials Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-03 13:45:22 +04:00
user_guide Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-23 18:50:17 +04:00
vidsurv
acircles_pattern.png
check_docs2.py fixed docs 2013-09-02 14:00:44 +04:00
check_docs_whitelist.txt
check_docs.py Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
CMakeLists.txt Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-27 15:28:14 +04:00
conf.py Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-25 15:02:24 +04:00
Doxyfile.in
haartraining.htm typos 2014-03-02 21:04:17 +04:00
mymath.sty Docs updated, added InputArray, fixes for makePtr,... 2013-09-26 19:02:35 +04:00
ocv.py Remove documentation for old python wrapper 2013-04-12 19:37:40 +04:00
opencv_cheatsheet.tex Applied feature #3375 and fix of pull 1842 to avoid merging problems later 2013-11-25 10:53:03 +01:00
opencv-logo2.png Removed incorrect iCCP chunks from GUI resources. 2013-08-30 09:49:24 -04:00
opencv-logo-white.png
opencv-logo.png
opencv.bib
opencv.ico
opencv.jpg
packaging.txt Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
patch_refman_latex.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
pattern.png
reformat.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00