From: Carl Sorensen <c_sorensen@byu.edu>
Date: Sat, 28 May 2011 02:18:04 +0000 (-0600)
Subject: Merge branch 'stable/2.14'
X-Git-Tag: release/2.15.0-1~26
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c75e554c93a26d28bf58fb41a5cfbaf13eec115d;p=lilypond.git

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

c75e554c93a26d28bf58fb41a5cfbaf13eec115d
diff --cc input/regression/glissando-consecutive.ly
index cfcb8de6c3,62c4085789..cbff423184
--- a/input/regression/glissando-consecutive.ly
+++ b/input/regression/glissando-consecutive.ly
@@@ -1,4 -1,6 +1,4 @@@
- \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 {
  
diff --cc input/regression/glissando-index.ly
index bae744123f,9b2d99cd11..bee41d57a7
--- a/input/regression/glissando-index.ly
+++ b/input/regression/glissando-index.ly
@@@ -1,4 -1,6 +1,4 @@@
- \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."