Alexander Alekhin 849228ac6a Merge pull request #2684 from ElenaGvozdeva:ippiDFT		2014-05-07 17:57:17 +04:00
..
doc	Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert	2014-04-08 11:05:30 +04:00
include/opencv2	Merge pull request #2676 from ilya-lavrenov:ipp_gaussianblur	2014-05-07 16:49:59 +04:00
perf	Merge pull request #2684 from ElenaGvozdeva:ippiDFT	2014-05-07 17:57:17 +04:00
src	Merge pull request #2684 from ElenaGvozdeva:ippiDFT	2014-05-07 17:57:17 +04:00
test	added cn>1 support to cv::norm (NORM_INF)	2014-04-30 14:59:37 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-02-25 15:02:24 +04:00