]> git.donarmstrong.com Git - lilypond.git/commit
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)
commit82bc9ad690e201aaa55694f8b92261ae7338f56a
treea5c7091b63844a7270d4fb822ef5f033ffd9c6db
parent944b1506b181ab0e2b2f67d33aacdf5495ba0e00
parentf010a93139a6f1cb74c95c2ae65c33807a977e86
Merge remote-tracking branch 'origin/translation' into staging

Conflicts:
Documentation/notation/percussion.itely
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