]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'master' into translation
authorJean-Charles Malahieude <lilyfan@orange.fr>
Sat, 25 Jul 2015 21:32:01 +0000 (23:32 +0200)
committerJean-Charles Malahieude <lilyfan@orange.fr>
Sat, 25 Jul 2015 21:32:01 +0000 (23:32 +0200)
# Conflicts:
# Documentation/fr/learning/fundamental.itely

1  2 
Documentation/fr/essay/engraving.itely
Documentation/fr/learning/fundamental.itely