generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
a3bde36c84
opencv/doc/tutorials/introduction
History
Roman Donchenko a3bde36c84 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/calib3d/include/opencv2/calib3d/calib3d.hpp
	modules/contrib/doc/facerec/facerec_api.rst
	modules/contrib/include/opencv2/contrib/contrib.hpp
	modules/contrib/src/facerec.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/highgui/src/loadsave.cpp
	modules/imgproc/src/pyramids.cpp
	modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
	modules/python/src2/gen.py
	modules/python/test/test.py
	modules/superres/test/test_superres.cpp
	samples/cpp/facerec_demo.cpp
2014-07-08 14:33:56 +04:00
..
android_binary_package Fix typos 2014-06-16 18:48:10 +08: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 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-25 15:02:24 +04:00
linux_install Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-06-09 18:03:03 +04:00
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-05-12 17:38:07 +04:00
windows_visual_studio_image_watch Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-05-19 18:39:20 +04:00
windows_visual_studio_Opencv Updated documentation: library names 2014-05-05 12:16:48 +02:00