Ilya Lavrenov eb1dd1900b fixed conditions		2014-05-16 12:18:35 +04:00
..
doc	Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert	2014-04-08 11:05:30 +04:00
include/opencv2	fixed IPP related warnings	2014-05-08 13:31:27 +04:00
perf	Merge pull request #2684 from ElenaGvozdeva:ippiDFT	2014-05-07 17:57:17 +04:00
src	fixed conditions	2014-05-16 12:18:35 +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