Andrey Pavlenko 9885a671ee Merge pull request #2346 from ilya-lavrenov:umat_tests_cleanup		2014-02-17 17:53:05 +04:00
..
include/opencv2	Merge pull request #2346 from ilya-lavrenov:umat_tests_cleanup	2014-02-17 17:53:05 +04:00
misc	Merge pull request #1837 from asmorkalov:android_opencl	2013-11-25 12:19:20 +04:00
src	disabled 'reshape', 'copyTo' test	2014-02-15 20:17:42 +04:00
CMakeLists.txt	Merge commit '60906d917' into merge-2.4	2013-12-30 16:47:05 +04:00