diff options
author | Carl Sorensen <c_sorensen@byu.edu> | 2011-05-27 20:18:04 -0600 |
---|---|---|
committer | Carl Sorensen <c_sorensen@byu.edu> | 2011-05-27 20:18:04 -0600 |
commit | c75e554c93a26d28bf58fb41a5cfbaf13eec115d (patch) | |
tree | 46eab760abedc79129f72ae749669b24812d38f0 | |
parent | 717f02443c1b93426f4f5d3b18fc8c5045b89a03 (diff) | |
parent | 553dac29f3bfdf79128406d6304063efce6cee23 (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
-rw-r--r-- | Documentation/es/notation/fretted-strings.itely | 2 | ||||
-rw-r--r-- | Documentation/es/web/introduction.itexi | 2 | ||||
-rw-r--r-- | input/regression/autobeam-nobeam.ly | 2 | ||||
-rw-r--r-- | input/regression/beam-collision-large-object.ly | 2 | ||||
-rw-r--r-- | input/regression/clef-octavation.ly | 2 | ||||
-rw-r--r-- | input/regression/glissando-chord-linebreak.ly | 2 | ||||
-rw-r--r-- | input/regression/glissando-chord.ly | 2 | ||||
-rw-r--r-- | input/regression/glissando-consecutive.ly | 2 | ||||
-rw-r--r-- | input/regression/glissando-index.ly | 2 | ||||
-rw-r--r-- | ly/predefined-mandolin-fretboards.ly | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/Documentation/es/notation/fretted-strings.itely b/Documentation/es/notation/fretted-strings.itely index cd4373095c..b2ef07a18b 100644 --- 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 58418fba20..d2e79d4954 100644 --- 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 205c939c03..2be83e3d0d 100644 --- 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 98922961cb..072521e232 100644 --- 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 6bce7ac59e..c916e4c12c 100644 --- 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 bcdb0b2938..770d08d73d 100644 --- 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 27ae104037..cd31d2732d 100644 --- 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 cfcb8de6c3..cbff423184 100644 --- 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 bae744123f..bee41d57a7 100644 --- 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 35c0ccdf7f..08525cf1ed 100644 --- 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/), |