Merge branch 'master' into 3.4

skvark · skvark · commit 69df18e316b7 · 2020-10-11T17:09:14.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -67,4 +67,5 @@ target/
 # Build temporary files
 /contrib.enabled
 /cv_version.py
+/cv2/version.py
 _skbuild/
