merged 2.4 into trunk

This commit is contained in:
Vadim Pisarevsky
2012-04-30 14:33:52 +00:00
parent 3f1c6d7357
commit d5a0088bbe
194 changed files with 10158 additions and 8225 deletions

View File

@@ -8,3 +8,8 @@ legacy. Deprecated stuff
:maxdepth: 2
motion_analysis
expectation_maximization
planar_subdivisions
feature_detection_and_description
common_interfaces_of_descriptor_extractors
common_interfaces_of_generic_descriptor_matchers