Roman Donchenko 920fd48228 Merge remote-tracking branch 'origin/master' into merge-2.4 ... Conflicts: modules/ocl/src/arithm.cpp		2013-11-26 15:32:44 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-11-11 16:55:36 +04:00
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-11-11 16:55:36 +04:00
perf	hopefully, the last test failures are fixed now	2013-10-24 23:31:00 +04:00
src	Merge remote-tracking branch 'origin/master' into merge-2.4	2013-11-26 15:32:44 +04:00
test	removed unnecessary opencl kernels	2013-11-18 12:02:10 -05:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00