opencv/doc/tutorials
Roman Donchenko 9c2272d520 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	.gitignore
	CMakeLists.txt
	doc/CMakeLists.txt
	modules/calib3d/src/stereosgbm.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/highgui/src/cap_openni.cpp
	modules/ml/include/opencv2/ml/ml.hpp
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/optical_flow_farneback.cpp
	platforms/scripts/camera_build.conf
	platforms/scripts/cmake_android_all_cameras.py
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
2013-11-26 15:05:26 +04:00
..
bioinspired Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
calib3d Normalized file endings. 2013-08-21 18:59:25 +04:00
core Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
definitions Merge branch 'master' into merge-2.4 2013-10-01 17:37:05 +04:00
features2d Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
general/table_of_content_general Normalized file endings. 2013-08-21 18:59:25 +04:00
gpu Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
highgui War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
images Merge pull request #1474 from f-morozov:for_pr 2013-10-02 11:49:54 +04:00
imgproc Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-09-10 11:30:19 +04:00
introduction Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-26 15:05:26 +04:00
ios Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
ml War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
objdetect changed int -> size_t when accessing std::vector 2013-08-31 23:35:03 +10:00
photo Docs updated, added InputArray, fixes for makePtr,... 2013-09-26 19:02:35 +04:00
video fixing trailing whitespaces 2013-09-01 22:38:21 +02:00
viz Update widget_pose.rst 2013-11-15 04:36:22 +03:00
tutorials.rst Merge pull request #1474 from f-morozov:for_pr 2013-10-02 11:49:54 +04:00