Nick D'Ademo 75b80e5d7d Added missing comma in enum.		2014-01-16 20:17:49 +11:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-03 17:35:21 +04:00
include/opencv2	Added missing comma in enum.	2014-01-16 20:17:49 +11:00
perf	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
src	Added PVAPI enums to highgui.hpp	2014-01-14 21:38:57 +11:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-23 18:50:17 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-23 18:50:17 +04:00