Andrey Pavlenko 99942e8043 Merge pull request #2166 from ilya-lavrenov:tapi_gftt		2014-01-21 22:29:41 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-23 18:50:17 +04:00
include/opencv2	Merge pull request #2173 from Nerei:viz	2014-01-20 18:05:11 +04:00
perf	added cv::[extract|insert]Channel to T-API	2014-01-20 13:52:07 +04:00
src	Merge pull request #2166 from ilya-lavrenov:tapi_gftt	2014-01-21 22:29:41 +04:00
test	Merge pull request #2163 from ilya-lavrenov:tapi_channels	2014-01-20 18:48:52 +04:00
CMakeLists.txt	Merge commit 'ee36717d' into merge-2.4	2013-12-30 16:49:39 +04:00