Roman Donchenko 313a0ad255 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/core/include/opencv2/core/internal.hpp modules/core/src/arithm.cpp modules/imgproc/src/imgwarp.cpp modules/objdetect/src/hog.cpp		2014-05-12 17:38:07 +04:00
..
_static
_themes/blue
pattern_tools
py_tutorials	Fixed type gPython -> Python	2014-03-26 23:15:42 -07:00
tutorials	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-05-12 17:38:07 +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
check_docs_whitelist.txt
check_docs.py
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-01-27 15:28:14 +04:00
conf.py	Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert	2014-04-08 11:05:30 +04:00
Doxyfile.in
haartraining.htm	typos	2014-03-02 21:04:17 +04:00
mymath.sty
ocv.py
opencv_cheatsheet.tex
opencv-logo2.png
opencv-logo-white.png
opencv-logo.png
opencv.bib
opencv.ico
opencv.jpg
packaging.txt
patch_refman_latex.py
pattern.png
reformat.py