]> git.donarmstrong.com Git - lilypond.git/commit
Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Fri, 2 Feb 2007 12:12:43 +0000 (13:12 +0100)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Fri, 2 Feb 2007 12:12:43 +0000 (13:12 +0100)
commitfe3687d66d2a768c83fede50ce901c6ef1b4969e
tree943c9c56754366157929c09d1ba8435edee6dad9
parent898c784d54983fa0f7bd5d2c6e5c29c8a8954438
parent38e0fd809d01de319d40224b5d2279888304b2d3
Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

Conflicts:

lily/tuplet-engraver.cc
lily/dynamic-performer.cc