Merge branch 'maint'

diff --git a/.gitignore b/.gitignore
index e0b91befb9012b8c2e9e04a4c2c5d7845b7c5e4a..62afef2347bb747aaaf8796e9f9ff5decc647e0e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -171,3 +171,6 @@ config.status
 config.mak.autogen
 config.mak.append
 configure
+tags
+TAGS
+cscope*