From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 9 Nov 2006 11:48:31 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://repo.or.cz/srv/git/lilypond
X-Git-Tag: release/2.10.0-2~16^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3ee0df13c3fe001cef0bef15adcbadfb2c394fd8;hp=1e52d3bfedddd681a27b3184ec8356b2c978416e;p=lilypond.git

Merge branch 'master' of git+ssh://repo.or.cz/srv/git/lilypond
---

diff --git a/.gitignore b/.gitignore
index 499dcc5c02..489d0c4e13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 config.hh
 config.make
 config.status
+config.status.lineno
 config.log
 *~
 GNUmakefile