2012/10/28 David Kastrup <d...@gnu.org>: > The translations for 2.16.1 are pretty much through, and I merged into > master again.
I updated Documentation/es/changes.tely for stable and committed to translation branch. Then updated the same file for 2.17 (I wrongly said it was for 2.16 in the commit info) and committed to staging branch. This is a source of conflict, but the merge shows no conflict. Why? -- Francisco Vila. Badajoz (Spain) www.paconet.org , www.csmbadajoz.com _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
