]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge remote-tracking branch 'origin/translation' into staging
authorDavid Kastrup <dak@gnu.org>
Sat, 15 Feb 2014 15:02:57 +0000 (16:02 +0100)
committerDavid Kastrup <dak@gnu.org>
Sat, 15 Feb 2014 15:02:57 +0000 (16:02 +0100)
Conflicts:
Documentation/notation/percussion.itely

1  2 
Documentation/es/extending/programming-interface.itely
Documentation/es/notation/simultaneous.itely
Documentation/fr/notation/percussion.itely
Documentation/fr/notation/simultaneous.itely
Documentation/fr/notation/vocal.itely

Simple merge