From: Carl Sorensen <c_sorensen@byu.edu>
Date: Tue, 21 Apr 2009 23:02:00 +0000 (-0600)
Subject: Merge branch 'dashed-slur2'
X-Git-Tag: release/2.13.1-1~37
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f7836bbd7dc03e7173590a76e419a5e826b1d689;p=lilypond.git

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
---

f7836bbd7dc03e7173590a76e419a5e826b1d689