Re: sorting out branch conflicts

2011-06-06 Thread Patrick McCarty
On Sun, Jun 5, 2011 at 4:18 PM, Graham Percival wrote: > To whoever enjoys this stuff, :-) > 2) make release/unstable be exactly what we have in master. I've just taken care of this. Regards, Patrick ___ lilypond-devel mailing list lilypond-devel@gn

sorting out branch conflicts

2011-06-05 Thread Graham Percival
To whoever enjoys this stuff, 1) please check that stable/2.14 has no useful commits that are not in master. I think the only difference is in VERSION and various disasters concerning Documentation/web/news-front.itexi, but I'd like to be safe. 2) make release/unstable be exactly what we h