# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1473011232 -3600
# Node ID e83437ddb505a04b357cd0154599419ba25bc1a0
# Parent  86423099b9a4b0001d751e9194d2e34979972de9# Parent  029d24dee8b82b1f7b2689fb54d63c5b12ba7649
Merge with upstream.

diff -r 86423099b9a4 -r e83437ddb505 .hgtags
--- a/.hgtags	Sun Sep 04 18:46:45 2016 +0100
+++ b/.hgtags	Sun Sep 04 18:47:12 2016 +0100
@@ -64,3 +64,5 @@
 c5a8553435e47fc50419aba5b7efde1970a87c0c build-default-227
 4791b1a4c7df97c0b51f5bbdbc8e6ddbfda5074e build-default-228
 4a4642a93a8701bf35cc0baf8a03683222528608 build-default-229
+e8cd5dca110e2cfee329705c9cec3b82587ca905 build-default-230
+a6f19c2c3b7fc04322d75f9cf02820e5ddedceba build-default-231
diff -r 86423099b9a4 -r e83437ddb505 Morris/BlackJoke.abc
--- a/Morris/BlackJoke.abc	Sun Sep 04 18:46:45 2016 +0100
+++ b/Morris/BlackJoke.abc	Sun Sep 04 18:47:12 2016 +0100
@@ -3,6 +3,8 @@
 A: Adderbury
 M: 6/8
 L: 1/8
+P: (A2.B)6
+Q: 120
 K: G
 P: A
 D | "G" DGG GFG | "C" AcB "D" AGF | "G" GAB "Em" dcB |\
diff -r 86423099b9a4 -r e83437ddb505 Morris/BlueBells.abc
--- a/Morris/BlueBells.abc	Sun Sep 04 18:46:45 2016 +0100
+++ b/Morris/BlueBells.abc	Sun Sep 04 18:47:12 2016 +0100
@@ -6,15 +6,21 @@
 A:Adderbury
 O:English
 R:Reel
-P:A.(AB)7B
+P:(A.B)6.C
 K:G
-I:speed 400
+Q: 160
+d2 | g4    f2  e2   | d4    e2  g2  | B2   B2   c2  A2  | G6 :|
+w: Oh   where oh_     where has my   high-land las-sie   gone?
+w: She's gone to the  woods with her fri-lly  knick-ers  on!
 P:A
-d2 | g4    f2  e2 | d4    e2  g2  | B2     B2   c2  A2  | G6 d2 |
-w: Oh   where oh_   where has my   high-  land las-sie   gone? She's
-     g4    f2  e2 | d4    e2  g2  | B2     B2   c2  A2  | G4 d2>c2 |
-w:  gone  to  the  woods with her fril-ly       knick-ers on! * *
+d2 | "G" g2 g2 "C" f2  e2 | "G" d2 d2 "C" e2 g2 |\
+     "G" B2  B2 "D7" c2 A2 | "G" G6 :|
 P:B
+d>c |\
 "G" B2 G2  "Bm" B2 d2 | "Em" g2 g2 "A7" e2 fg  |\
-"D" f2 d2 "A7" e2 c2 | "D" d2 d2 "C" e2 "D7" f2 |
+"D" f2 d2 "A7" e2 c2 | "D" d4 "C" e2 "D7" f2 |
 "G" g2 g2 "C" f2 e2 | "G" d2 d2 "C"e2 g2 | "G" B2 B2 "D7" c2 A2  | "G" G8 ||
+P:C
+Q:320
+"^Double time" d2 | "G" g2 g2 "C" f2  e2 | "G" d2 d2 "C" e2 g2  |\
+     "G" B2  B2 "D7" c2 A2 | "G" G6 :|