Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 71835fac083b5cdcdd2c61d57a1a39df71cd77cb..8f7ab1020a102025ea5de098ea51aaa07ac76fae 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,34 +1,41 @@
 config.hh
-config.make
-config.status
-config.status.lineno
-config.log
-*~
-GNUmakefile
-aclocal.m4
-autom4te.cache
-configure
-*.ps
+*-midi.ly
+*-systems.tex
+*-systems.texi
+*.afm
+*.aux
 *.eps
+*.log
+*.midi
+*.orig
 *.pdf
-TAGS
-tags
+*.ps
+*.pyc
+*.rej
+*.svg
+*.tfm
+*~
+.dotest
 .gdbinit
+.htaccess
+/.sconf_temp
+/.sconsign.dblite
+/scons.cache
 ?.*
-*.midi
+AUTHORS.txt
+GNUmakefile
+INSTALL.txt
+TAGS
 \#*
-lily-[0-9][0-9][0-9]*
-gcstat*.scm
-*.aux
-*.svg
-*.pyc
-*.log
-.htaccess
-*.tfm
-*.afm
-*.orig
-*.rej
-*-systems.texi
-*-systems.tex
-*-midi.ly
 a.out
+aclocal.m4
+autom4te.cache
+config.log
+config.make
+config.status
+config.status.lineno
+configure
+gcstat*.scm
+lily-[0-9][0-9][0-9]*
+out-scons
+tags
\ No newline at end of file