]> git.donarmstrong.com Git - lilypond.git/commit
resolve merge
authorDon Armstrong <don@donarmstrong.com>
Sat, 30 Jul 2011 01:21:36 +0000 (18:21 -0700)
committerDon Armstrong <don@donarmstrong.com>
Sat, 30 Jul 2011 01:21:36 +0000 (18:21 -0700)
commit941dff9d2a67080e0dd8474f1e70f0c72ace6424
tree6831ce4265c0c26a3915ddcecbe985005ca1ea73
parent5a22d6233a39d3164e1ca043244794c268be4ad0
parentf41973ff763d5972a85995b6d40c864281ec6714
resolve merge
lily/midi-stream.cc
lily/piano-pedal-engraver.cc
lily/prob.cc
lily/relocate.cc
lily/source-file.cc
lily/translator.cc
scm/ps-to-png.scm
stepmake/bin/config.sub