Roman Donchenko 9218f4976c Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/contrib/src/retina.cpp modules/gpu/perf/perf_video.cpp modules/gpuoptflow/src/tvl1flow.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/perf/perf_calib3d.cpp modules/ocl/perf/perf_color.cpp modules/ocl/perf/perf_match_template.cpp modules/ocl/src/precomp.hpp samples/gpu/stereo_multi.cpp		2013-09-02 19:44:51 +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
tutorials	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-09-02 19:44:51 +04:00
user_guide	Deleted all trailing whitespace.	2013-08-21 18:59:24 +04:00
vidsurv
acircles_pattern.png
check_docs2.py	fixed documentation build	2013-06-10 15:52:01 +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	Normalized file endings.	2013-08-21 18:59:25 +04:00
conf.py	Removed references to opencv.itseez.com	2013-06-28 12:48:12 +04:00
Doxyfile.in	Normalize line endings and whitespace	2012-10-17 15:57:49 +04:00
haartraining.htm
license.txt	minor in license file	2012-08-07 13:22:41 +04:00
mymath.sty	Normalized file endings.	2013-08-21 18:59:25 +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	merged revisions r7802,r7804,r7805 from 2.4 branch	2012-04-03 00:33:33 +00:00
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