Roman Donchenko 3d7a457c97 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: doc/tutorials/introduction/linux_install/linux_install.rst modules/core/doc/operations_on_arrays.rst modules/core/include/opencv2/core/core.hpp modules/core/src/system.cpp modules/gpu/src/cuda/resize.cu modules/imgproc/doc/miscellaneous_transformations.rst modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst modules/video/src/bgfg_gaussmix2.cpp		2014-05-19 18:39:20 +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-19 18:39:20 +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	Docs updated, added InputArray, fixes for makePtr,...	2013-09-26 19:02:35 +04:00
ocv.py
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
opencv-logo-white.png
opencv-logo.png
opencv.bib
opencv.ico
opencv.jpg
packaging.txt
patch_refman_latex.py
pattern.png
reformat.py