mirror of
https://github.com/opencv/opencv.git
synced 2024-11-24 11:10:21 +08:00
fee2ed37fc
Conflicts: modules/contrib/src/retina.cpp modules/core/include/opencv2/core/mat.hpp modules/core/src/algorithm.cpp modules/core/src/arithm.cpp modules/features2d/src/features2d_init.cpp modules/gpu/include/opencv2/gpu/gpu.hpp modules/gpu/perf/perf_imgproc.cpp modules/imgproc/src/generalized_hough.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/video/src/tvl1flow.cpp modules/video/src/video_init.cpp
11 lines
75 B
Plaintext
11 lines
75 B
Plaintext
*.autosave
|
|
*.pyc
|
|
*.user
|
|
*~
|
|
.*.swp
|
|
.DS_Store
|
|
.sw[a-z]
|
|
Thumbs.db
|
|
tags
|
|
tegra/
|