mshabunin 3ed89a8879 Merge with master and fix conflicts		2014-08-13 18:24:11 +04:00
..
GDAL_IO	Fixing double to uchar conversion warning.	2014-07-11 07:33:42 -07:00
video-input-psnr-ssim	Split highgui module to videoio and highgui	2014-07-14 23:16:47 +04:00
video-write	Split highgui module to videoio and highgui	2014-07-14 23:16:47 +04:00
AddingImagesTrackbar.cpp	Extract imgcodecs module from highgui	2014-07-07 16:28:08 +04:00
BasicLinearTransformsTrackbar.cpp	Extract imgcodecs module from highgui	2014-07-07 16:28:08 +04:00