Merge pull request #1427 from SpecLad:merge-2.4

This commit is contained in:
Roman Donchenko
2013-09-10 18:28:19 +04:00
committed by OpenCV Buildbot
41 changed files with 3521 additions and 150 deletions

1
.gitignore vendored
View File

@@ -8,3 +8,4 @@ tegra/
.*.swp
tags
Thumbs.db
*.autosave