95c2e8b51f
Conflicts: .gitignore doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst modules/gpu/src/match_template.cpp modules/imgproc/include/opencv2/imgproc/imgproc.hpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/perf/perf_precomp.hpp
13 lines
104 B
Plaintext
13 lines
104 B
Plaintext
*.pyc
|
|
.DS_Store
|
|
refman.rst
|
|
OpenCV4Tegra/
|
|
tegra/
|
|
*.user
|
|
.sw[a-z]
|
|
.*.swp
|
|
tags
|
|
build/
|
|
Thumbs.db
|
|
*.autosave
|