Roman Donchenko 3c4b24d531 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: CMakeLists.txt modules/highgui/src/cap.cpp modules/nonfree/src/surf.ocl.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/color.cpp modules/ocl/src/gftt.cpp modules/ocl/src/imgproc.cpp samples/ocl/facedetect.cpp		2013-12-23 18:50:17 +04:00
..
android_binary_package	Android Manager Version++.	2013-11-06 14:24:18 +04:00
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	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	add clojure tutorial	2013-12-11 13:28:27 +01: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