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

Conflicts:
	cmake/OpenCVModule.cmake
	doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	doc/tutorials/features2d/feature_homography/feature_homography.rst
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/arithm.cpp
	modules/gpu/perf/perf_video.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/java/generator/src/cpp/VideoCapture.cpp
	modules/nonfree/src/opencl/surf.cl
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/python/src2/cv2.cpp
	samples/gpu/CMakeLists.txt
	samples/gpu/super_resolution.cpp

2013-08-19 19:02:36 +04:00

..

_static

removed obsolete docs

2011-05-09 16:20:46 +00:00

_themes/blue

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

2013-07-03 19:53:21 +04:00

pattern_tools

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

tutorials

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

2013-08-19 19:02:36 +04:00

user_guide

Merge branch '2.4'

2013-01-25 16:30:36 +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 documentation build

2013-06-10 15:52:01 +04:00

check_docs_whitelist.txt

updated whitelist

2011-07-08 14:34:03 +00:00

check_docs.py

Merge branch '2.4'

2013-04-12 15:35:38 +04:00

CMakeLists.txt

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

2013-08-19 19:02:36 +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

"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

moved the new docs from docroot to doc

2011-05-09 16:34:47 +00:00

ocv.py

Remove documentation for old python wrapper

2013-04-12 19:37:40 +04:00

opencv_cheatsheet.tex

Fixed cheatsheet for loop (bug #2701)

2013-01-28 18:41:59 +04:00

opencv-logo2.png

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00: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

Normalize whitespace in documentation and text files

2012-10-17 21:42:09 +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