Roman Donchenko 4b51b1e3a8 Merge pull request #1059 from dominikrose:dc1394_2-1394b		2013-06-28 14:47:45 +04:00
..
doc	Fixed multiple issues in docs (bug #2410)	2013-01-31 17:34:40 +04:00
include/opencv2/highgui	Merge pull request #1063 from alekcac:conversion	2013-06-28 14:41:35 +04:00
perf	Perf test failure fixes for Media Foundation.	2013-06-25 03:35:57 -07:00
src	Merge pull request #1059 from dominikrose:dc1394_2-1394b	2013-06-28 14:47:45 +04:00
test	Test fixes	2013-06-27 15:47:37 +04:00
CMakeLists.txt	added conversions between UIImage and cv::Mat	2013-06-28 13:26:54 +04:00