Merge pull request #3104 from dkanafeev:new_ipp_func_master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 19 Aug 2014 09:06:45 +0000 (09:06 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 19 Aug 2014 09:06:45 +0000 (09:06 +0000)
1  2 
modules/imgproc/src/color.cpp

Simple merge