Merged the trunk r8852:8880

This commit is contained in:
Andrey Kamaev
2012-07-02 11:04:43 +00:00
parent 304dac7f00
commit b368f99d03
60 changed files with 507 additions and 255 deletions

View File

@@ -203,5 +203,5 @@ void CV_MserTest::run(int)
}
}
TEST(Features2d_MSER, regression) { CV_MserTest test; test.safe_run(); }
TEST(Features2d_MSER, DISABLED_regression) { CV_MserTest test; test.safe_run(); }