git.donarmstrong.com Git - lilypond.git/commit

]> git.donarmstrong.com Git - lilypond.git/commit

author	Carl Sorensen <c_sorensen@byu.edu>
	Sat, 28 May 2011 02:18:04 +0000 (20:18 -0600)
committer	Carl Sorensen <c_sorensen@byu.edu>
	Sat, 28 May 2011 02:18:04 +0000 (20:18 -0600)
commit	c75e554c93a26d28bf58fb41a5cfbaf13eec115d
tree	46eab760abedc79129f72ae749669b24812d38f0	tree \| snapshot
parent	717f02443c1b93426f4f5d3b18fc8c5045b89a03	commit \| diff
parent	553dac29f3bfdf79128406d6304063efce6cee23	commit \| diff

Merge branch 'stable/2.14'

Conflicts:
Documentation/es/notation/fretted-strings.itely
Documentation/es/web/introduction.itexi
Documentation/web/news-front.itexi
VERSION
input/regression/autobeam-nobeam.ly
input/regression/beam-collision-large-object.ly
input/regression/clef-octavation.ly
input/regression/glissando-chord-linebreak.ly
input/regression/glissando-chord.ly
input/regression/glissando-consecutive.ly
input/regression/glissando-index.ly
ly/predefined-mandolin-fretboards.ly

Debian packaging of lilypond

RSS Atom

Documentation/es/notation/fretted-strings.itely	diff1 \|	diff2 \|	blob \| history
input/regression/autobeam-nobeam.ly	diff1 \|	diff2 \|	blob \| history
input/regression/glissando-consecutive.ly	diff1 \|	diff2 \|	blob \| history
input/regression/glissando-index.ly	diff1 \|	diff2 \|	blob \| history