From: John Mandereau <john.mandereau@gmail.com>
Date: Mon, 7 Jul 2008 10:18:53 +0000 (+0200)
Subject: Merge branch 'master' into lilypond/translation
X-Git-Tag: release/2.11.51-1~1^2~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1dff29aea8a32c30f7fcfadf8a00afa0371dbf7a;p=lilypond.git

Merge branch 'master' into lilypond/translation

* master:
  Update musicexp.py with new \sustain*  and \arpeggio* syntax
  Added new "octavo" paper size in paper.scm
  Compile fix.
  GDP: NR 3.3.3 MIDI first pass
  GDP: NR 3.3.3 Text encoding
  GDP: NR 3 & 5: Add remaining FIXMEs
  Run convert-ly on input/manual/*.ly
  Run convert-ly on input/
  Remove more bad converted files.
  More fixing of bad instructions.
  Fix my bad instructions to Carl.
  Run convert-ly on input/lsr and input/regression
  Fix nasty trick to break convert-ly.
  LSR: add world-music.
  Fix Graham's so-called `Fixes'.
  Fixes.
  Update from Andrew.
  Change predefines for arpeggio, sustain, and sostenuto; convert-ly on docs
---

1dff29aea8a32c30f7fcfadf8a00afa0371dbf7a