opencv/doc
Roman Donchenko d58cd9851f Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	CMakeLists.txt
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	modules/core/src/cmdparser.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/doc/introduction.rst
	modules/gpu/perf/perf_video.cpp
	modules/highgui/doc/reading_and_writing_images_and_video.rst
	modules/ocl/src/cl_context.cpp
	modules/video/include/opencv2/video/background_segm.hpp
	samples/cpp/image_sequence.cpp
	samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
	samples/python/chessboard.py
	samples/python/cvutils.py
	samples/python/demhist.py
	samples/python/dft.py
	samples/python/distrans.py
	samples/python/edge.py
	samples/python/ffilldemo.py
	samples/python/fitellipse.py
	samples/python/houghlines.py
	samples/python/inpaint.py
	samples/python/logpolar.py
	samples/python/morphology.py
	samples/python/numpy_array.py
	samples/python/watershed.py
2013-12-03 17:35:21 +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-12-03 17:35:21 +04:00
user_guide Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +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 docs 2013-09-02 14:00:44 +04:00
check_docs_whitelist.txt updated whitelist 2011-07-08 14:34:03 +00:00
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 "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 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 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 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 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