]> 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, 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)
commit827797f2d209e14f09a17017e10ea27d17db4a8e
treee9a1693d3f78438d8d5cd4612bfeeead8d5d2f2a
parentdcbe4187b56ee3f420c3ad81bad54e8406c727e8
parent787b8ceb0892bc95c3eea0dc2921985e602e5a61
Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

Conflicts:

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