From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 24 Dec 2006 15:23:06 +0000 (+0100)
Subject: try to make merge work (urg)
X-Git-Tag: release/2.11.5-1~18
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=099190a0ca18fac4a5f583d00f72d868dbde3095;p=lilypond.git

try to make merge work (urg)
---

diff --git a/input/midi/midi-transposing.ly b/input/midi/midi-transposing.ly
new file mode 100644
index 0000000000..e69de29bb2