Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 8 Apr 2014 07:05:29 +0000 (11:05 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 8 Apr 2014 07:05:30 +0000 (11:05 +0400)
commit9ec823d8004dcd711018c81d627443b63739d341
tree6d5c6f031a0465a8a7c0ea859c1ac67ea8611a32
parent6f055d7a7652def0baf6f8b8281d10e810c7867c
parentf9c52894833cb4da02bb6f245409c3e20b4a67fd
Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert
CMakeLists.txt
cmake/OpenCVFindLibsPerf.cmake
cmake/templates/cvconfig.h.in
doc/conf.py