Mercurial > dottes

changeset 423:6ada1bc5cbeb build-default-184

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with ssh://hg.cryhavoc.org.uk/dottes
author Jim Hague <jim.hague@acm.org>
date Wed, 11 Sep 2013 22:30:38 +0100
parents a3b1d186a368 (diff) 0e1c1ea43af4 (current diff)
children ef7a4c2fe274
files
diffstat 5 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Sep 11 22:30:10 2013 +0100
+++ b/.hgtags	Wed Sep 11 22:30:38 2013 +0100
@@ -16,3 +16,7 @@
 f1c4abe4fc75cb9cc9cae3b596be558cc7406142 build-default-175
 a6a096bb279a73540fa9b20ac1d540ae41c480e9 build-default-176
 db656da32b2cee530291af5432e0807723283928 build-default-177
+e8c1afc109ae2258c48153e0cde4411d0a1594ea build-default-180
+2a1e1754e4bf5482443181cf3bb12688a7da5f14 build-default-181
+664605b337a9c3e16f2e833fb18471cd3f571058 build-default-182
+11e0f2790a5f9fb958aad933d6cb94eec03e1bd9 build-default-183
--- a/Session/EmmaFromFinland.abc	Wed Sep 11 22:30:10 2013 +0100
+++ b/Session/EmmaFromFinland.abc	Wed Sep 11 22:30:38 2013 +0100
@@ -7,5 +7,5 @@
 K: FMaj
 D/F/ |: "Dm" A2 A | F D F | A2 A | F D D/F/ |
 "A7" E2 E/F/ | G F E | [1 "Dm" D>EF/G/ | A2 D/F/ :| [2 "n.c." D3 | D F A |]
-"Gm" d2 d | d c B | "Dm" A2 A | A G F |
-"A7" E2 E/F/ | G F E | [1 "Dm" D3 | "n.c." D F A :| [2 "Dm" D3 | D2 |]
+|: "Gm" d2 d | d c B | "Dm" A2 A | A G F |
+"A7" E2 E/F/ | G F E | [1 "Dm" D3 | "n.c." D F A :| [2 "Dm" D3 | D3 |]
--- a/Session/MazurkaAvignon.abc	Wed Sep 11 22:30:10 2013 +0100
+++ b/Session/MazurkaAvignon.abc	Wed Sep 11 22:30:38 2013 +0100
@@ -5,7 +5,7 @@
 Q:120
 K:G
 "G" DG GF G2 | DB BA B2 | "Am" cB AG FG | "D" AG FE D2 |
-"G" DG GF G2 | DB BA B2 | "Am" cB AG FG | "D" AB "G" G2 z2 :|
+"G" DG GF G2 | DB BA B2 | "Am" cB AG FG | "D" AB "G" G2 :|
 (Bc) |\
 "G" d2 de dc | B2 B2 AB | "C" c2 cd cB | "D" A2 A2 (Bc) |
-"G" d2 de dc | B2 B2 AB | "Am" cB AG FG | "D" AB "G" G2 z2 :|
+"G" d2 de dc | B2 B2 AB | "Am" cB AG FG | "D" AB "G" G2 :|
--- a/Session/SalmonTails.abc	Wed Sep 11 22:30:10 2013 +0100
+++ b/Session/SalmonTails.abc	Wed Sep 11 22:30:38 2013 +0100
@@ -6,8 +6,8 @@
 L:1/4
 Q:160
 K:G
-B/A/ | "G"GE DE|G2 G3/2A/2| Bd AB/2A/2|"D"GE DE|"G"GE DE|"C" G2 G3/2A/2|\
-"G"Bd "D7"AB/2A/2|"G"G2 G :|
+"G"GE DE|G2 G3/2A/2| Bd AB/2A/2|"D"GE DE|"G"GE DE|"C" G2 G3/2A/2|\
+"G"Bd "D7"AB/2A/2|"G" G2 G2 :|
 "G"Bd d2|"C"ce e2|"G"dB AB/2A/2|"D"GE D2|"G"Bd d2|"C"ce e3/2f/2|"G"gf ed\
 |"D7"ef "G"g2|
 "G"Bd d2|"C"ce e2|"G"dB AB/2A/2|"D"GE D2|"G"GE DE|"Em" G2 G3/2A/2|\
--- a/dottes.html	Wed Sep 11 22:30:10 2013 +0100
+++ b/dottes.html	Wed Sep 11 22:30:38 2013 +0100
@@ -27,7 +27,7 @@
       <p>Click on the tune title or first line music for a page showing
         the dots for the tune and giving links for downloading the tune
         in various formats. If you don't read music, or you'd like to work
-        on practicing learning tunes by ear, or just playing along with
+        on practising learning tunes by ear, or just playing along with
         the tune, click on the learner icon
         <img src="../img/learner.png">
         for a page where you can listen to the tune repeatedly, either