]> git.donarmstrong.com Git - lilypond.git/commit
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)
commita8d54f44df1fe4f89823f6b78364870ce51174dc
treea42253ddf78200827e8b52732178a892e9b7f7ac
parent580adceb59a849cb184427ac1145b5ff39684254
parenta64a249d392abb438c598c319ea544fb23d626ca
Merge branch 'lilypond/translation'

Conflicts:
Documentation/fr/web/introduction.itexi

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