From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 7 Nov 2006 01:20:04 +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~32^2~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5383cafcc75ae088f833df0081e2b2a73a5442a1;p=lilypond.git

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

Conflicts:

	buildscripts/git-update-changelog.py
	scm/define-grob-properties.scm
	scm/music-functions.scm
---

5383cafcc75ae088f833df0081e2b2a73a5442a1
diff --cc buildscripts/git-update-changelog.py
index e3bc06384f,35dd2e6c75..54ab112d0b
--- a/buildscripts/git-update-changelog.py
+++ b/buildscripts/git-update-changelog.py
@@@ -44,6 -44,6 +44,7 @@@ class Commit
      def compare (self, other):
          return sign (time.mktime (self.date) - time.mktime (other.date))
  
++
      def check_diff_chunk (self, filename, chunk):
          removals = []
          def note_removal (m):
@@@ -53,10 -53,7 +54,10 @@@
  
          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: