mirror of
https://github.com/opencv/opencv.git
synced 2024-12-01 23:30:06 +08:00
4f1aed98de
Conflicts: .gitignore modules/contrib/src/detection_based_tracker.cpp modules/core/include/opencv2/core/core.hpp modules/core/include/opencv2/core/internal.hpp modules/core/src/gpumat.cpp modules/core/src/opengl.cpp modules/gpu/src/cuda/safe_call.hpp modules/highgui/src/cap.cpp modules/imgproc/include/opencv2/imgproc/imgproc.hpp modules/ocl/doc/image_processing.rst modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/perf/perf_haar.cpp modules/ocl/src/haar.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/kmeans.cpp modules/ocl/src/svm.cpp modules/ocl/test/test_objdetect.cpp samples/ocl/adaptive_bilateral_filter.cpp
11 lines
92 B
Plaintext
11 lines
92 B
Plaintext
*.autosave
|
|
*.pyc
|
|
*.user
|
|
.*.swp
|
|
.DS_Store
|
|
.sw[a-z]
|
|
/modules/refman.rst
|
|
Thumbs.db
|
|
tags
|
|
tegra/
|