From: John Mandereau <john.mandereau@gmail.com>
Date: Sat, 2 Aug 2008 10:10:56 +0000 (+0200)
Subject: Merge branch 'master' into lilypond/translation
X-Git-Tag: release/2.11.55-1~9^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=49f9b097ce73335f8a6b3436c43df1aed8a77288;p=lilypond.git

Merge branch 'master' into lilypond/translation

* master: (39 commits)
  Index entry updates from Ralph.
  Change fret markings to roman from old-roman
  Update from Joseph
  Update from Ralph.
  Minor formatting quirk.
  LSR: Update.
  Add convert rule for \put-adjacent.
  Bump version.
  Update from Joseph
  Update indices from Ralph
  Improved patch for bezier barre indicators
  Fix bug in curved barre location for fret-diagrams
  GDP: LM 5.1.4 Drop a TODO
  Update index entries from Ralph
  Clarify index policy
  Remove debug code.
  Fix \put-adjacent.
  GDP: NR 4 Merge Displaying spacing into Fitting music
  New function: \ottava #oct, replaces #(set-octavation oct)
  NR 5 Fix FIXMEs (1)
  ...
---

49f9b097ce73335f8a6b3436c43df1aed8a77288