third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9c2272d520
opencv/doc
History
Roman Donchenko 9c2272d520 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	.gitignore
	CMakeLists.txt
	doc/CMakeLists.txt
	modules/calib3d/src/stereosgbm.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/highgui/src/cap_openni.cpp
	modules/ml/include/opencv2/ml/ml.hpp
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/optical_flow_farneback.cpp
	platforms/scripts/camera_build.conf
	platforms/scripts/cmake_android_all_cameras.py
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
2013-11-26 15:05:26 +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 small correction in Py tutorials 2013-11-06 10:22:08 +05:30
tutorials Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-26 15:05:26 +04:00
user_guide Fixed incorrectly unprefixed constant names in the OpenNI tutorial. 2013-10-22 14:48:25 +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 2013-11-26 15:05:26 +04:00
conf.py Switched OpenCV to a 3-component version number. 2013-11-15 19:41:53 +04:00
Doxyfile.in Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
haartraining.htm
license.txt
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 Converted tabs to spaces. 2013-08-21 18:59:26 +04: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