Roman Donchenko 652a0bd5ce Merge pull request #2262 from SpecLad:merge-2.4		2014-02-03 15:33: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 #2217 from ilya-lavrenov:tapi_superres	2014-02-03 14:38:59 +04:00
perf	Merge pull request #2110 from hmax:master	2014-01-23 14:37:34 +04:00
src	Merge pull request #2217 from ilya-lavrenov:tapi_superres	2014-02-03 14:38:59 +04:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-02-03 13:23:59 +04:00
CMakeLists.txt	Merge commit 'ee36717d' into merge-2.4	2013-12-30 16:49:39 +04:00