From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 8 Nov 2006 14:21:07 +0000 (+0100)
Subject: Merge branch 'cvs-head' of ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master... 
X-Git-Tag: release/2.10.0-2~26
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=daffbcdf881ddacfb28c3f3ef67b83d7ca7dd843;p=lilypond.git

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

Conflicts:

	buildscripts/git-update-changelog.py
---

daffbcdf881ddacfb28c3f3ef67b83d7ca7dd843
diff --cc buildscripts/git-update-changelog.py
index 82c5d6316d,465e407ce1..09f0d16b7a
--- a/buildscripts/git-update-changelog.py
+++ b/buildscripts/git-update-changelog.py
@@@ -54,10 -53,10 +54,9 @@@ class Commit
  
          if removals == []:
              return True
--
          if not os.path.exists (filename):
              return False
-    
 -        
++
          contents = open (filename).read ()
          for r in removals:
              if r not in contents: