Andrey Pavlenko 0a3aca230c Merge pull request #2436 from ilya-lavrenov:tapi_dft_fix		2014-03-04 19:21:15 +04:00
..
doc	Merge pull request #2399 from SpecLad:merge-2.4	2014-02-25 19:42:54 +04:00
include/opencv2	Merge pull request #2408 from ilya-lavrenov:tapi_core_opt	2014-03-04 18:37:26 +04:00
perf	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-02-25 15:02:24 +04:00
src	Merge pull request #2436 from ilya-lavrenov:tapi_dft_fix	2014-03-04 19:21:15 +04:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-03 13:45:22 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-02-25 15:02:24 +04:00