]> git.donarmstrong.com Git - lilypond.git/commit
Resolve conflict on scm/midi.scm
authorNicolas Sceaux <nicolas.sceaux@free.fr>
Sat, 18 Oct 2008 15:29:27 +0000 (17:29 +0200)
committerNicolas Sceaux <nicolas.sceaux@free.fr>
Sat, 18 Oct 2008 15:29:27 +0000 (17:29 +0200)
commit187f1f619ecd5a8f42c5baf92782df1f64cbf2d9
treec88dcf4e3ca318f96de0345fcdd2bbe04be5b188
parent5c14a087ca6cbd665fd631452b7b1283ba0387c3
Resolve conflict on scm/midi.scm
scm/midi.scm