Merge branch 'collectd-4.10' into collectd-5.0

[collectd.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index e8f9af6..75cb307 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,7 @@ src/stamp-h1
 .libs/
 src/collectd
 src/collectd-nagios
+src/collectdctl
 src/collectdmon
 src/*.1
 src/*.5
@@ -65,3 +66,9 @@ bindings/java/org/collectd/java/*.class
 
 # python stuff
 *.pyc
+
+# tag stuff
+src/tags
+
+# backup stuff
+*~