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
- \version "2.15.0"
+ \version "2.13.61"
-%% This should really be 2.15.0, because the glissando code
-%% hasn't been backported -- this is a git-only test at this point
\header {
- \version "2.15.0"
-% FIXME: this is a fake version number to allow git master
-% to compile. See discussion on lilypond-devel.
+ \version "2.13.61"
\header {
texidoc = "Individual glissandi within a chord can be tweaked."