opencv/doc/tutorials/introduction
Roman Donchenko 4f1aed98de Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	.gitignore
	modules/contrib/src/detection_based_tracker.cpp
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/gpumat.cpp
	modules/core/src/opengl.cpp
	modules/gpu/src/cuda/safe_call.hpp
	modules/highgui/src/cap.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/test_objdetect.cpp
	samples/ocl/adaptive_bilateral_filter.cpp
2013-11-11 16:55:36 +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 svn repository web references are replaced with links to git 2012-08-07 14:30:36 +04: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 Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00