David Kastrup <[email protected]> writes:

> Well, I've not been able to nicely redo the merges (git !@#$!#).  So I
> just threw everything release-related out of staging.  If you redo the
> merge into staging and the version number bump in staging, you should be
> fine.
>
> I made a slightly more complex fix in order to defuse the
> parser.cc/parser.hh regeneration conflict: they are now generated
> independently.

I'm off to bed right now.  Hope that Patchy will find things to its
liking again.

-- 
David Kastrup


_______________________________________________
lilypond-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Reply via email to