Vladislav Vinogradov 5138b7d209 Merge branch 'master' into cuda-dev		2012-12-24 13:48:33 +04:00
..
doc	Merge release 2.4.3	2012-11-02 17:58:02 +04:00
include/opencv2/highgui	Merge branch master into cuda-dev	2012-12-11 01:12:14 +04:00
perf	Corrected sanity checks in several perf tests	2012-12-12 01:00:47 +04:00
src	Merge branch 'master' into cuda-dev	2012-12-24 13:48:33 +04:00
test	Revert incompletely applied patch from #2192	2012-12-03 09:55:53 +04:00
CMakeLists.txt	Drop unsupported imageio from grfmt	2012-12-03 09:56:09 +04:00