]> 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>
Wed, 31 Jan 2007 17:07:11 +0000 (18:07 +0100)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Wed, 31 Jan 2007 17:07:11 +0000 (18:07 +0100)
commit3f8485925e8c879fe4c9ae86acef9804126c3b91
tree5867b19ea9bcffb6f5f609dbe88fd158e8411fc4
parent0fdc16375c79b31150cfe459b3388ee3c7784553
parent9a42b64734dac35b2bdc5170bb2343f2d090a757
Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

Conflicts:

lily/constrained-breaking.cc
12 files changed:
lily/align-interface.cc
lily/axis-group-interface.cc
lily/bar-number-engraver.cc
lily/beam.cc
lily/constrained-breaking.cc
lily/grob.cc
lily/prob-scheme.cc
lily/skyline.cc
lily/slur.cc
lily/stem.cc
lily/system.cc
lily/tie-formatting-problem.cc