Merge pull request #2593 from arkunze:pullreq/140319-color

fd90efc9 · Andrey Pavlenko · OpenCV Buildbot · 6bfbcf02 · 785acc18 · fd90efc9
Commit fd90efc9 authored Apr 11, 2014 by Andrey Pavlenko Committed by OpenCV Buildbot Apr 11, 2014
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 0 deletions

color.cpp modules/imgproc/src/color.cpp +0 -0

cvtcolor.cl modules/imgproc/src/opencl/cvtcolor.cl +0 -0

No files found.
--- a/modules/imgproc/src/color.cpp
+++ b/modules/imgproc/src/color.cpp
--- a/modules/imgproc/src/opencl/cvtcolor.cl
+++ b/modules/imgproc/src/opencl/cvtcolor.cl