opencv/samples/cpp/tutorial_code
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 retina included in namespace bioinspired + followed suggestions made by Vadim 2013-07-14 19:28:37 +02:00
calib3d Applied all fixes related to translating C to C++ code 2013-11-17 20:34:50 +01:00
core Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-19 16:21:09 +04:00
features2D Applied all fixes related to translating C to C++ code 2013-11-17 20:34:50 +01:00
gpu/gpu-basics-similarity replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
HighGUI Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-19 16:21:09 +04:00
Histograms_Matching Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-19 16:21:09 +04:00
images Erasing two images from cpp/tutorial folder 2011-11-03 06:09:31 +00:00
ImgProc Applied all fixes related to translating C to C++ code 2013-11-17 20:34:50 +01:00
ImgTrans Applied all fixes related to translating C to C++ code 2013-11-17 20:34:50 +01:00
introduction Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-26 15:05:26 +04:00
ml Normalized file endings. 2013-08-21 18:59:25 +04:00
objectDetection Applied all fixes related to translating C to C++ code 2013-11-17 20:34:50 +01:00
photo/hdr_imaging Docs updated, added InputArray, fixes for makePtr,... 2013-09-26 19:02:35 +04:00
ShapeDescriptors Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-19 16:21:09 +04:00
TrackingMotion Applied all fixes related to translating C to C++ code 2013-11-17 20:34:50 +01:00
video fixing trailing whitespaces 2013-09-01 22:13:49 +02:00
viz removed trailing spaces 2013-09-18 12:50:55 +01:00