mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-24 13:58:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
a3bde36c84
opencv/modules/highgui
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
..
doc Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-04-28 12:08:21 +04:00
include/opencv2 added jpeg with optimized coding support. 2014-03-27 13:34:33 -04:00
perf Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
src Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-07-08 14:33:56 +04:00
test cv2cvtest part2 2014-04-09 13:08:51 +04:00
CMakeLists.txt Merge remote-tracking branch 'upstream/master' 2014-03-25 20:44:06 +00:00