mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-02 16:00:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
e290436a4c
opencv/modules/highgui/doc
History
Vladislav Vinogradov 0c7663eb3b Merge branch 'master' into gpu-cuda-rename 
Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudacodec/src/thread.cpp
	modules/cudacodec/src/thread.hpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp
2013-09-06 15:44:44 +04:00
..
pics added pictures for OpenCV 2.x reference manual; fixed some build problems and done some more cleanup work 2011-03-05 21:26:13 +00:00
highgui.rst merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00
qt_new_functions.rst Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
reading_and_writing_images_and_video.rst Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
user_interface.rst Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00