Merge branch 'dashed-slur2'
commit29764e99ca1c6df766b4e6044505033049c74917
authorCarl Sorensen <c_sorensen@byu.edu>
Tue, 21 Apr 2009 23:02:00 +0000 (21 17:02 -0600)
committerCarl Sorensen <c_sorensen@byu.edu>
Tue, 21 Apr 2009 23:02:00 +0000 (21 17:02 -0600)
treeaecf405540281ea62eac9c10db0fe5e4d90d9d68
parent4d193df8196c33871ceb48756c55edd1b1079fbd
parent0f8f35f09e6ca9ce9cde71a1a24553238244b3d4
Merge branch 'dashed-slur2'

Update dashed-slur

Conflicts:
Documentation/user/expressive.itely
input/new/making-slurs-with-complex-dash-structure.ly
lily/arpeggio.cc
lily/bezier.cc
lily/include/bezier.hh
lily/lookup.cc
lily/slur.cc
lily/tie.cc
ly/property-init.ly
python/convertrules.py
Documentation/user/rhythms.itely
ly/property-init.ly