Merge remote-tracking branch 'origin/translation' into master

[lilypond.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index e0fae2d1e44836bf6830edab2fa532728d32b1f5..3097acfe263f48f2e926788eef9c521b6c51a789 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -53,7 +53,6 @@ TAGS
 \#*
 \#.*
 a.out
-aclocal.m4
 autom4te.cache
 config-*.hh
 config-*.make
@@ -78,3 +77,4 @@ Documentation/lilypond
 semantic.cache
 .lock-wscript
 build/
+.gitfilelist