]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'lilypond/translation'
authorFrancisco Vila <francisco.vila@hispalinux.es>
Fri, 29 Jul 2011 09:31:45 +0000 (11:31 +0200)
committerFrancisco Vila <francisco.vila@hispalinux.es>
Fri, 29 Jul 2011 09:31:45 +0000 (11:31 +0200)
Conflicts:
Documentation/snippets/string-quartet-template-with-separate-parts.ly

1  2 
Documentation/snippets/string-quartet-template-with-separate-parts.ly

index c2bf8c018554dd37af2891cb6b83eea9da3723b8,bf82a3cea08ea05299152a9a01dddc84f129c0f5..786c53729cf95fcaf12576de06f5de5b3a55caeb
@@@ -30,69 -30,9 +30,6 @@@ Non dimenticare di togliere i commenti 
    lsrtags = "unfretted-strings, template"
  
  
 -
--
--
  %% Translation of GIT committish: 70f5f30161f7b804a681cd080274bfcdc9f4fe8c
    texidoces = "
  El fragmento de código @qq{Plantilla de cuarteto de cuerda} produce un