Merge pull request #1213 from kdrobnyh:color
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 28 Aug 2013 09:31:08 +0000 (13:31 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 28 Aug 2013 09:31:09 +0000 (13:31 +0400)
1  2 
modules/imgproc/src/color.cpp

Simple merge