From: John Mandereau <john.mandereau@gmail.com>
Date: Wed, 2 Jan 2008 17:07:08 +0000 (+0100)
Subject: Merge branch 'master' of /home/lilycvs/git/lily/
X-Git-Tag: release/2.11.38-1~135^2~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e0ab7a37fa31290d42c9e5534ac5480c7d9f4a8f;p=lilypond.git

Merge branch 'master' of /home/lilycvs/git/lily/

* 'master' of /home/lilycvs/git/lily/:
  Compile fix.
  Formatting fixes from Alard; thanks!
---

e0ab7a37fa31290d42c9e5534ac5480c7d9f4a8f