Vadim Pisarevsky 934cb6c452 Merge pull request #2680 from adrians:remove_cv_err		2014-05-19 17:35:03 +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 #2680 from adrians:remove_cv_err	2014-05-19 17:35:03 +04:00
perf	Merge pull request #2684 from ElenaGvozdeva:ippiDFT	2014-05-07 17:57:17 +04:00
src	Merge pull request #2698 from GregoryMorse:patch-2	2014-05-19 14:52:58 +04:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-05-12 17:38:07 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-02-25 15:02:24 +04:00