]> git.donarmstrong.com Git - lilypond.git/commit
Merge remote-tracking branch 'origin/master' into translation
authorDavid Kastrup <dak@gnu.org>
Thu, 6 Dec 2012 14:53:14 +0000 (15:53 +0100)
committerDavid Kastrup <dak@gnu.org>
Thu, 6 Dec 2012 14:53:14 +0000 (15:53 +0100)
commit01df8ad908c92687d0c352e5ad5f067e52809423
treedb5d7aa1cdc1516653290671a16b308287ddf21b
parent90220594547127a65e0e2b91e45f4a1fa9ca0c5a
parentd03ae375a34eaac79b224c4d01bd24749c4c6787
Merge remote-tracking branch 'origin/master' into translation

Conflicts:
Documentation/changes.tely

has been resolved by taking the version in master

Documentation/fr/notation/input.itely
Documentation/fr/notation/spacing.itely

Code conflicts (possibly from use of convert-ly) have been resolved by
taking the code corresponding to the current English translation.
Documentation/fr/notation/input.itely
Documentation/fr/notation/rhythms.itely
Documentation/fr/notation/spacing.itely