]> git.donarmstrong.com Git - lilypond.git/commit - Documentation/fr/user/fretted-strings.itely
Merge branch 'lilypond/translation'
authorJohn Mandereau <john.mandereau@gmail.com>
Thu, 8 May 2008 12:07:14 +0000 (14:07 +0200)
committerJohn Mandereau <john.mandereau@gmail.com>
Thu, 8 May 2008 12:07:14 +0000 (14:07 +0200)
commitae0f0645588e10c34d1d5040127ae2029c6598c9
tree9f372593749e82451f265b718e6d59658a5755d1
parentdd1799070f3874574afe57ba905fd17371f6467b
parenteeb973b4126dad28bd9f60ab2af772c919401e23
Merge branch 'lilypond/translation'

* lilypond/translation:
  Oops, restored file from another branch
  Update -- chords, clusters, and parallel music example
  Removed obsolete file
  Update of tutorial

Conflicts:

Documentation/es/user/tutorial.itely
Documentation/es/user/tutorial.itely