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

diff --git a/Documentation/es/notation/fretted-strings.itely b/Documentation/es/notation/fretted-strings.itely
index cd4373095c06fc444fbca2edef6f8064792a7f47..b2ef07a18b69a5f5e0016e139d3b203b7eabef58 100644 (file)
--- a/Documentation/es/notation/fretted-strings.itely
+++ b/Documentation/es/notation/fretted-strings.itely
@@ -1,7 +1,7 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
 
 @ignore
-    Translation of GIT committish: 42f47af78202968f412a940f7ce9b3b1136fd236
+    Translation of GIT committish: 5becf12f5ada67346f70ad8cfe68589466619305
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  For details, see the Contributors'

diff --git a/Documentation/es/web/introduction.itexi b/Documentation/es/web/introduction.itexi
index 58418fba2067f6192ac1b526faa63c061565c5c9..d2e79d49548ae5bfb9d84f4ec5c748672d4a1e0c 100644 (file)
--- a/Documentation/es/web/introduction.itexi
+++ b/Documentation/es/web/introduction.itexi
@@ -1,6 +1,6 @@
 @c -*- coding: utf-8; mode: texinfo; documentlanguage: es -*-
 @ignore
-    Translation of GIT committish: d282588015bad1ed86833848a5bcbdc43cfdc9e5
+    Translation of GIT committish: 346067ab7e42c9cbc359d48b23c79dc0780c8320
 
     When revising a translation, copy the HEAD committish of the
     version that you are working on.  For details, see the Contributors'

diff --git a/input/regression/autobeam-nobeam.ly b/input/regression/autobeam-nobeam.ly
index 205c939c0386d8529ab9005e030502a6e4d26039..2be83e3d0d706483c558c7666f44481cb25157bc 100644 (file)
--- a/input/regression/autobeam-nobeam.ly
+++ b/input/regression/autobeam-nobeam.ly
@@ -1,4 +1,4 @@
-\version "2.15.0"
+\version "2.13.62"
 
 \header {
 

diff --git a/input/regression/beam-collision-large-object.ly b/input/regression/beam-collision-large-object.ly
index 98922961cb90c2bc1bbe9446b1c180bcccdce481..072521e2328e4dbb8033e116b4f135279792f92f 100644 (file)
--- a/input/regression/beam-collision-large-object.ly
+++ b/input/regression/beam-collision-large-object.ly
@@ -2,7 +2,7 @@
   texidoc = "Behave sensibly in the presence of large collisions."
 }
 
-\version "2.15.0"
+\version "2.13.62"
 \new Staff {
   <<
     { \voiceOne s2 }

diff --git a/input/regression/clef-octavation.ly b/input/regression/clef-octavation.ly
index 6bce7ac59e0af93492cf790cc9cb2b41d7261b2b..c916e4c12ce714167fb7b0942a61158c200f3c25 100644 (file)
--- a/input/regression/clef-octavation.ly
+++ b/input/regression/clef-octavation.ly
@@ -1,4 +1,4 @@
-\version "2.15.0"
+\version "2.13.62"
 
 \header {
 

diff --git a/input/regression/glissando-chord-linebreak.ly b/input/regression/glissando-chord-linebreak.ly
index bcdb0b29382db22bc92f0f5b3b027e779e44ab6f..770d08d73d71a276817f781a234cff1d94d850f0 100644 (file)
--- a/input/regression/glissando-chord-linebreak.ly
+++ b/input/regression/glissando-chord-linebreak.ly
@@ -1,4 +1,4 @@
-\version "2.15.0"
+\version "2.13.62"
 
 \header {
 

diff --git a/input/regression/glissando-chord.ly b/input/regression/glissando-chord.ly
index 27ae10403791cdd11f56088418a3ad69e41ec7c9..cd31d2732d535309e9f0613b83b11b18a5c1f09f 100644 (file)
--- a/input/regression/glissando-chord.ly
+++ b/input/regression/glissando-chord.ly
@@ -1,4 +1,4 @@
-\version "2.15.0"
+\version "2.13.62"
 
 \header {
   texidoc = "LilyPond typesets glissandi between chords."

diff --git a/input/regression/glissando-consecutive.ly b/input/regression/glissando-consecutive.ly
index cfcb8de6c33dc53e443bde57eb1056666609a694..cbff423184a0572127bd6b30404d19fb0e25bf00 100644 (file)
--- a/input/regression/glissando-consecutive.ly
+++ b/input/regression/glissando-consecutive.ly
@@ -1,4 +1,4 @@
-\version "2.15.0"
+\version "2.13.61"
 
 \header {
 

diff --git a/input/regression/glissando-index.ly b/input/regression/glissando-index.ly
index bae744123fb2aed140193d369f3fd8c38281ce98..bee41d57a7a50456244ed88772240bddb4930ee5 100644 (file)
--- a/input/regression/glissando-index.ly
+++ b/input/regression/glissando-index.ly
@@ -1,4 +1,4 @@
-\version "2.15.0"
+\version "2.13.61"
 
 \header {
   texidoc = "Individual glissandi within a chord can be tweaked."

diff --git a/ly/predefined-mandolin-fretboards.ly b/ly/predefined-mandolin-fretboards.ly
index 35c0ccdf7f4b4bcf61126fd3a6ca74068e83d15e..08525cf1ed06e946d1ea295b7e4478cf04daf298 100644 (file)
--- a/ly/predefined-mandolin-fretboards.ly
+++ b/ly/predefined-mandolin-fretboards.ly
@@ -15,7 +15,7 @@
 %%%% You should have received a copy of the GNU General Public License
 %%%% along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-\version "2.15.0"
+\version "2.13.61"
 
 %%%% sources:
 %%%%   mandolincafe website (http://www.mandolincafe.com/),