merged the trunk r8719:8731 and 8807

41eaa406 · Marina Kolpakova · Andrey Kamaev · be9b40c5 · 41eaa406
隐藏空白更改
内联并排

Showing with 0 addition and 0 deletion

testdata/cv/features2d/descriptor_extractors/descriptor-surf testdata/cv/features2d/descriptor_extractors/descriptor-surf +0 -0

未找到文件。
--- a/testdata/cv/features2d/descriptor_extractors/descriptor-surf
+++ b/testdata/cv/features2d/descriptor_extractors/descriptor-surf