Merge pull request #2700 from ilya-lavrenov:tapi_cvtColor
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 8 May 2014 13:01:37 +0000 (17:01 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 8 May 2014 13:01:38 +0000 (17:01 +0400)
1  2 
modules/imgproc/src/color.cpp

Simple merge