Alexander Alekhin 694d7726b5 Merge pull request #2762 from ilya-lavrenov:ipp_sort		2014-05-22 12:30:53 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-05-19 18:39:20 +04:00
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-05-19 18:39:20 +04:00
perf	Merge pull request #2776 from ilya-lavrenov:tapi_meanstddev	2014-05-21 17:43:29 +04:00
src	Merge pull request #2762 from ilya-lavrenov:ipp_sort	2014-05-22 12:30:53 +04:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-05-19 18:39:20 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-02-25 15:02:24 +04:00