opencv/doc/tutorials/introduction
Roman Donchenko f77c68e0fa Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/imgproc/src/opencl/integral_sqrsum.cl
	modules/nonfree/doc/feature_detection.rst
	modules/nonfree/include/opencv2/nonfree/ocl.hpp
	modules/nonfree/src/surf_ocl.cpp
	modules/nonfree/test/test_features2d.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/match_template.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
	modules/ocl/test/test_imgproc.cpp
2014-03-31 14:42:00 +04:00
..
android_binary_package fixed doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst 2014-02-14 23:04:03 +05:30
clojure_dev_intro add tutorial content 2013-12-11 13:30:52 +01:00
crosscompilation NEON instruction set control unified for regular and cross-compiler builds. 2013-12-20 16:02:37 +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 Applied feature #3375 and fix of pull 1842 to avoid merging problems later 2013-11-25 10:53:03 +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 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-25 15:02:24 +04:00
linux_install -j8 in linux_installation tutorial 2014-02-13 13:52:00 +05:30
load_save_image Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-31 14:42:00 +04:00
table_of_content_introduction add clojure tutorial 2013-12-11 13:28:27 +01:00
windows_install Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-03 13:45:22 +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