opencv/doc/tutorials
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
..
bioinspired retina included in namespace bioinspired + followed suggestions made by Vadim 2013-07-14 19:28:37 +02:00
calib3d Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-19 19:02:36 +04:00
core Minimize usages of legacy C API inside the library 2013-04-16 12:00:02 +04:00
definitions Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-03 19:53:21 +04:00
features2d Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-19 19:02:36 +04:00
general/table_of_content_general 1) Converted all images to JPG to reduce size. 2011-07-19 22:08:54 +00:00
gpu Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-03 19:53:21 +04:00
highgui Minimize usages of legacy C API inside the library 2013-04-16 12:00:02 +04:00
images adding retina tutorial 2012-10-30 15:06:13 +04:00
imgproc fix parenthesis 2013-05-22 13:57:43 +03:00
introduction Fix whitespace errors. 2013-08-06 18:07:00 +04:00
ios Normalize whitespace in documentation and text files 2012-10-17 21:42:09 +04:00
ml Fixed CR line endings in non_linear_svms.rst. 2013-08-13 13:29:09 +04:00
objdetect Main module headers are moved 1 level up 2013-03-13 17:26:56 +04:00
video/table_of_content_video Normalize whitespace in documentation and text files 2012-10-17 21:42:09 +04:00
tutorials.rst updated demos and tutorial regarding the Retina class transfer to bioinspired module. 2013-06-12 22:43:36 +02:00