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

Conflicts:
	doc/tutorials/definitions/tocDefinitions.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/src/system.cpp
	modules/features2d/src/freak.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/cl_context.cpp
	modules/ocl/test/test_api.cpp

2013-12-16 15:02:12 +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

small correction in Py tutorials

2013-11-06 10:22:08 +05:30

tutorials

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

2013-12-16 15:02:12 +04:00

user_guide

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

2013-12-03 17:35:21 +04:00

vidsurv

…

acircles_pattern.png

…

check_docs2.py

fixed docs

2013-09-02 14:00:44 +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

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

2013-11-26 15:05:26 +04:00

conf.py

Switched OpenCV to a 3-component version number.

2013-11-15 19:41:53 +04:00

Doxyfile.in

Normalize line endings and whitespace

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

haartraining.htm

…

license.txt

…

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

…

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