Merge pull request #2677 from ilya-lavrenov:ipp_compilation
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 29 Apr 2014 08:26:48 +0000 (12:26 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 29 Apr 2014 08:26:49 +0000 (12:26 +0400)

Trivial merge