Files
opencv-MIRROR/modules/highgui/src
Roman Donchenko 3939d78336 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/core/include/opencv2/core/types_c.h
	modules/gpu/src/cuda/imgproc.cu
	modules/gpu/src/cuda/safe_call.hpp
	modules/gpu/src/error.cpp
	modules/gpu/src/imgproc.cpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/shapedescr.cpp
	modules/python/src2/cv2.cpp
	modules/python/src2/cv2.cv.hpp
2013-07-22 18:38:57 +04:00
..
2013-06-18 07:02:09 +04:00
2013-06-18 07:02:09 +04:00
2013-06-27 15:47:37 +04:00
2013-03-22 22:14:40 +04:00
2013-06-25 03:35:30 -07:00
2013-06-11 21:17:31 +04:00
2013-04-08 17:10:31 +04:00
2013-04-08 13:29:04 +04:00
2013-06-06 11:15:00 +01:00
2010-07-16 09:12:15 +00:00