Merge branch 'collectd-4.10' into collectd-5.0

[collectd.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index b85bdec..75cb307 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,9 @@ bindings/java/org/collectd/java/*.class
 
 # python stuff
 *.pyc
+
+# tag stuff
+src/tags
+
+# backup stuff
+*~