third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2c4bbb313c
opencv/modules/video
History
Roman Donchenko 2c4bbb313c Merge commit '43aec5ad' into merge-2.4 
Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py
2013-08-27 13:26:44 +04:00
..
doc Merge branch 'master' into merge-2.4 2013-08-16 14:14:12 +04:00
include/opencv2 Move C API of opencv_video to separate file 2013-04-11 17:38:33 +04:00
perf Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-19 19:02:36 +04:00
src Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
test Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-19 19:02:36 +04:00
CMakeLists.txt Global CMake reorganization: 2012-02-03 11:26:49 +00:00