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

Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	modules/core/include/opencv2/core/version.hpp
	modules/cudacodec/src/ffmpeg_video_source.cpp
	modules/gpu/src/video_writer.cpp
	modules/highgui/test/test_ffmpeg.cpp
	modules/highgui/test/test_video_io.cpp
	modules/highgui/test/test_video_pos.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/blend.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/cl_operations.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/safe_call.hpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_moments.cpp
	samples/ocl/squares.cpp

2013-11-05 16:38:23 +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

Emergency fix: rename a conflicting label in the tutorials.

2013-10-01 16:10:40 +04:00

tutorials

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

2013-11-05 16:38:23 +04:00

user_guide

Fixed incorrectly unprefixed constant names in the OpenNI tutorial.

2013-10-22 14:48:25 +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 'upstream/2.4' into merge-2.4

2013-10-15 20:08:52 +04:00

conf.py

Merge pull request #1315 from dbloisi:add_bs_tutorial

2013-10-01 15:29:38 +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

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

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

"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