Merge branch 'master' into translation

[lilypond.git] / Documentation / snippets / avoiding-collisions-with-chord-fingerings.ly

diff --git a/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly b/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
index 19d1e5b8f75fb65b5f06a1b20e4a2c26b7975313..3a25a7a30c1e463f9df5349834fff093cf870fa8 100644 (file)
--- a/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
+++ b/Documentation/snippets/avoiding-collisions-with-chord-fingerings.ly
@@ -1,12 +1,15 @@
-%% Do not edit this file; it is automatically
+%% DO NOT EDIT this file manually; it is automatically
 %% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
 %% This file is in the public domain.
-\version "2.12.2"
+\version "2.14.2"
 
 \header {
-  lsrtags = "rhythms, editorial-annotations, chords, tweaks-and-overrides"
+  lsrtags = "editorial-annotations, chords, tweaks-and-overrides, rhythms"
 
-%% Translation of GIT committish: fa19277d20f8ab0397c560eb0e7b814bd804ecec
+%% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
 
   texidoces = "
 
@@ -32,6 +35,7 @@ overridden.
   doctitle = "Avoiding collisions with chord fingerings"
 } % begin verbatim
 
+
 \relative c' {
   \set fingeringOrientations = #'(up)
   \set stringNumberOrientations = #'(up)