Merge branch 'cvs-head' of ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master...

[lilypond.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9526956a35b288df570402c6bdfaea48129885dd..489d0c4e13b96581723991aa0b38a360098d5cb0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 config.hh
 config.make
 config.status
+config.status.lineno
 config.log
 *~
 GNUmakefile
@@ -25,4 +26,5 @@ gcstat*.scm
 .htaccess
 *.tfm
 *.afm
-
+*.orig
+*.rej