Hi, In fact, yesterday's "make key cancellations independent of extraNatural" introduced a simple conflict with my patch, which I have just resolved.
Other files were automatically merged. After some testing, I will upload a new patch-set. Regards, Felipe On 10 February 2011 16:13, <percival.music...@gmail.com> wrote: > Sorry, I still can't apply this cleanly to git master. Are you sure you > did a rebase? (I admit that I'm not totally certain about how to do > this, but I've seen people in lilypond-devel talking about it -- maybe > look through the mailing list archives for tips?) > > At the moment, I see failures in > lily/key-engraver.cc > and warnings in > lily/parser.yy > ly/engraver-init.ly > scm/translation-functions.scm > > > http://codereview.appspot.com/3789044/ > _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
