]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'lilypond/translation'
authorJohn Mandereau <john.mandereau@gmail.com>
Mon, 27 Sep 2010 07:35:21 +0000 (09:35 +0200)
committerJohn Mandereau <john.mandereau@gmail.com>
Mon, 27 Sep 2010 07:35:21 +0000 (09:35 +0200)
Conflicts:
Documentation/fr/web/introduction.itexi

I retained the most recently added committish in
Documentation/fr/web/introduction.itexi.

1  2 
Documentation/fr/web/introduction.itexi
make/website.make

Simple merge