Andrey Pavlenko b3cfe6b446 Merge pull request #2341 from alalek:ocl_fix_error_processing		2014-02-18 13:27:38 +04:00
..
doc	fixed docs	2014-02-05 10:49:56 +04:00
include/opencv2	Merge pull request #2356 from SpecLad:merge-2.4	2014-02-18 12:14:57 +04:00
perf	Merge pull request #2345 from ilya-lavrenov:tapi_3cn_perf	2014-02-17 17:38:26 +04:00
src	Merge pull request #2341 from alalek:ocl_fix_error_processing	2014-02-18 13:27:38 +04:00
test	disabled 'reshape', 'copyTo' test	2014-02-15 20:17:42 +04:00
CMakeLists.txt	Merge commit 'ee36717d' into merge-2.4	2013-12-30 16:49:39 +04:00