Merge branch 'maint'

diff --git a/.gitignore b/.gitignore
index 165b256e2e81ef36ca6b8f9dd8db8d0cc4f164d4..4ff2fec2785d21055bdcb5d9661d5090624b92da 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+GIT-BUILD-OPTIONS
 GIT-CFLAGS
 GIT-GUI-VARS
 GIT-VERSION-FILE