Roman Donchenko 75087580de Merge pull request #1704 from SpecLad:merge-2.4		2013-10-29 13:13:05 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-10-22 14:28:00 +04:00
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-10-28 13:38:25 +04:00
perf	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-10-28 13:38:25 +04:00
src	Merge pull request #1704 from SpecLad:merge-2.4	2013-10-29 13:13:05 +04:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-10-28 13:38:25 +04:00
CMakeLists.txt	ocl: force to use Khronos OpenCL headers	2013-10-18 15:47:11 +04:00