Merge branch 'collectd-4.10' into collectd-5.0

[collectd.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 46c8c04..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
@@ -61,3 +62,13 @@ bindings/perl/pm_to_blib
 # java stuff
 bindings/java/java-build-stamp
 bindings/java/org/collectd/api/*.class
+bindings/java/org/collectd/java/*.class
+
+# python stuff
+*.pyc
+
+# tag stuff
+src/tags
+
+# backup stuff
+*~