Evgeny Talanin d3c73071ea Temporarily disable test on Mac		2012-05-29 11:41:24 +00:00
..
doc	Fixed documentation: corrected parameter names	2012-05-29 10:36:19 +00:00
include/opencv2/highgui	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00
perf	merged all the latest changes from 2.4 to trunk	2012-04-13 21:50:59 +00:00
src	Fixed property names in cap_dshow #1993	2012-05-29 05:41:46 +00:00
test	Temporarily disable test on Mac	2012-05-29 11:41:24 +00:00
CMakeLists.txt	Fixed PvAPI search on Windows #1927	2012-05-24 20:10:13 +00:00