Merge pull request #7141 from lupustr3:pvlasov/instrumentation_extension
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 23 Aug 2016 16:48:25 +0000 (16:48 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 23 Aug 2016 16:48:25 +0000 (16:48 +0000)
1  2 
modules/imgproc/src/color.cpp

Simple merge