Andrey Kamaev 9b4f2d1b53 Merge pull request #373 from ilysenkov:bugfix_2440		2013-01-30 19:37:16 +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	Merge pull request #373 from ilysenkov:bugfix_2440	2013-01-30 19:37:16 +04:00
test	Merge pull request #373 from ilysenkov:bugfix_2440	2013-01-30 19:37:16 +04:00
CMakeLists.txt	Merge pull request #358 from taka-no-me:objc_exceptions	2013-01-30 14:40:32 +04:00