From: John Mandereau Date: Sun, 2 Sep 2007 10:28:43 +0000 (+0200) Subject: Merge branch 'master' into lilypond/translation X-Git-Tag: release/2.11.33-1~4^2~12^2~62 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=beb2ebd4ad1dd5baafdec7a6cad7da21322d43e6;p=lilypond.git Merge branch 'master' into lilypond/translation * master: bump version Fix German docs compilation Update German docs MusicXML: wrap lyrics in quotes. MusicXML: replace soft-hyphens in the lyrics with soft dash Implement the conversion of lyrics from MusicXML to lilypond. MusicXML: don't use the class_dict directly musicxml: if no work-number or opus is found, return an empty string. MusicXML: convert score information into the \header{..} construct in lilypond. MusicXML: coding style fixes. Reorganize main doc page; remove biblio and regtests. Fix list of platforms for binaries. oops, wrong fix another typo typo Fix confusing order of polypony/chords. add regtest for x-staff beam with script case. Conflicts: Documentation/de/user/introduction.itely Documentation/de/user/tutorial.itely Documentation/po/de.po --- beb2ebd4ad1dd5baafdec7a6cad7da21322d43e6