Roman Donchenko f77c68e0fa Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	modules/imgproc/src/opencl/integral_sqrsum.cl
	modules/nonfree/doc/feature_detection.rst
	modules/nonfree/include/opencv2/nonfree/ocl.hpp
	modules/nonfree/src/surf_ocl.cpp
	modules/nonfree/test/test_features2d.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/match_template.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
	modules/ocl/test/test_imgproc.cpp

2014-03-31 14:42:00 +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

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-03-31 14:42:00 +04:00

user_guide

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-12-23 18:50:17 +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

2014-01-27 15:28:14 +04:00

conf.py

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-03-31 14:42:00 +04:00

Doxyfile.in

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

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

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