mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-28 21:20:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
9c2272d520
opencv/doc/tutorials/introduction
History
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
..
android_binary_package Android Manager Version++. 2013-11-06 14:24:18 +04:00
crosscompilation Tutorial for ARM Linux cross compilation added. 2013-02-20 12:48:30 +04:00
desktop_java Added a new tutorial "Using OpenCV Java with Eclipse". Removed information related to Eclipse from "Desktop Java" tutorial. 2013-08-27 22:42:03 +03:00
display_image Wrong example at the visual studio tutorial. Fixed link, fixed sample 2013-11-22 10:41:17 +01:00
how_to_write_a_tutorial Normalized file endings. 2013-08-21 18:59:25 +04:00
ios_install Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
java_eclipse Added a new tutorial "Using OpenCV Java with Eclipse". Removed information related to Eclipse from "Desktop Java" tutorial. 2013-08-27 22:42:03 +03:00
linux_eclipse Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
linux_gcc_cmake After commit c7bbd1a, 'include_directories()' is needed in the CMakeLists.txt (user side). This commit updates the documentation. 2013-10-03 00:43:12 +02:00
linux_install Removed a duplicate line. 2013-08-28 13:13:15 +04:00
load_save_image Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
table_of_content_introduction Added a new tutorial "Using OpenCV Java with Eclipse". Removed information related to Eclipse from "Desktop Java" tutorial. 2013-08-27 22:42:03 +03:00
windows_install Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
windows_visual_studio_image_watch Converted tabs to spaces. 2013-08-21 18:59:26 +04:00
windows_visual_studio_Opencv Wrong example at the visual studio tutorial. Fixed link, fixed sample 2013-11-22 10:41:17 +01:00