Merge branch 'master' into 3.4

69df18e3 · Olli-Pekka Heinisuo · f9934e2b · 2ce6d972 · 69df18e3
隐藏空白更改
内联并排

Showing with 1 addition and 0 deletion

.gitignore .gitignore +1 -0

未找到文件。
--- a/.gitignore
+++ b/.gitignore
@@ -67,4 +67,5 @@ target/
 # Build temporary files
 /contrib.enabled
 /cv_version.py
+/cv2/version.py
 _skbuild/