Merge remote-tracking branch 'origin/master' into merge-2.4
[platform/upstream/opencv.git] / .gitignore
1 *.autosave
2 *.pyc
3 *.user
4 .*.swp
5 .DS_Store
6 .sw[a-z]
7 Thumbs.db
8 tags
9 tegra/