]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Fri, 8 Jun 2007 23:46:00 +0000 (20:46 -0300)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Fri, 8 Jun 2007 23:46:00 +0000 (20:46 -0300)
Conflicts:

input/lsr/text/creating-text-spanners.ly


Trivial merge