generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9c83f6c4fb
opencv/doc/tutorials
History
Roman Donchenko 9c83f6c4fb Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	modules/core/include/opencv2/core/version.hpp
	modules/cudacodec/src/ffmpeg_video_source.cpp
	modules/gpu/src/video_writer.cpp
	modules/highgui/test/test_ffmpeg.cpp
	modules/highgui/test/test_video_io.cpp
	modules/highgui/test/test_video_pos.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/blend.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/cl_operations.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/safe_call.hpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_moments.cpp
	samples/ocl/squares.cpp
2013-11-05 16:38:23 +04:00
..
bioinspired Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
calib3d Normalized file endings. 2013-08-21 18:59:25 +04:00
core Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
definitions Merge branch 'master' into merge-2.4 2013-10-01 17:37:05 +04:00
features2d Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
general/table_of_content_general Normalized file endings. 2013-08-21 18:59:25 +04:00
gpu Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
highgui War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
images Merge pull request #1474 from f-morozov:for_pr 2013-10-02 11:49:54 +04:00
imgproc Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-09-10 11:30:19 +04:00
introduction Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-05 16:38:23 +04:00
ios Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-28 13:38:25 +04:00
ml War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
objdetect changed int -> size_t when accessing std::vector 2013-08-31 23:35:03 +10:00
photo Docs updated, added InputArray, fixes for makePtr,... 2013-09-26 19:02:35 +04:00
video fixing trailing whitespaces 2013-09-01 22:38:21 +02:00
viz removed trailing spaces 2013-09-18 12:50:55 +01:00
tutorials.rst Merge pull request #1474 from f-morozov:for_pr 2013-10-02 11:49:54 +04:00