Andrey Kamaev 33c26a93c6 Merge pull request #376 from taka-no-me:solve_tiff_conflict		2013-01-30 19:36:09 +04:00
..
doc	fixed many errors in warnings in rst docs; added ocl module description (by Niko Li)	2012-10-31 15:15:51 +04:00
include/opencv2/highgui	Normalize line endings and whitespace	2012-10-17 15:32:23 +04:00
perf	Video IO perf tests guarded.	2013-01-29 11:09:49 +04:00
src	fix v4l yes-yes build	2013-01-30 17:04:33 +04:00
test	Solve conflict between tiff.h and opencv2/core/types_c.h	2013-01-30 16:36:50 +04:00
CMakeLists.txt	Merge pull request #358 from taka-no-me:objc_exceptions	2013-01-30 14:40:32 +04:00