# HG changeset patch # User Jim Hague <jim.hague@acm.org> # Date 1392417576 0 # Node ID 0c7ba14debe3ebba317653faed0f7b9e9a4f7821 # Parent 16e41ac460db6cfa3ffea208f456e96cf004160c# Parent daab2842258ead593f33b38880a8920094fc0578 Automated merge with ssh://hg.cryhavoc.org.uk/dottes diff -r daab2842258e -r 0c7ba14debe3 .hgtags --- a/.hgtags Fri Feb 14 22:38:49 2014 +0000 +++ b/.hgtags Fri Feb 14 22:39:36 2014 +0000 @@ -27,3 +27,5 @@ 1009b89a0893df09b8db9e463a05ca01430d9e94 build-default-188 8b4678e4ccdc73eb4e5ac76468c616de0cfe7e38 build-default-189 00f30ffdf42de9a52f1b6c2584238a903c34fe23 build-default-190 +ae0836b5f4ddcf2e23a54c5f9785403ac1c2edb9 build-default-191 +abdf2745a9a8ca4151be266219a84e14a8937300 build-default-192 diff -r daab2842258e -r 0c7ba14debe3 Morris/ShaveTheDonkey.abc --- a/Morris/ShaveTheDonkey.abc Fri Feb 14 22:38:49 2014 +0000 +++ b/Morris/ShaveTheDonkey.abc Fri Feb 14 22:39:36 2014 +0000 @@ -1,6 +1,6 @@ -%abc X:1 T:Shave the Donkey +T:Step n' Fetch Her M:4/4 S:Bacon (RD) A:Bampton @@ -10,8 +10,8 @@ K:G I:speed 300 P:A -|: "G" d2 B2 "D7" dcBA | "G" G2 g2 "C" e2 g2 |\ +"G" d2 B2 "D7" dcBA | "G" G2 g2 "C" e2 g2 |\ "G" d2 B2 "D7" dcBA | "G" G2 B2 G4 :| P:B -|: "D7" A3 c "G" B2 d2 | "D7" A3 c "G" B2 d2 |\ -"D7" A3 c "C" c2 e2 | "D7" dcBA "G" G4 :| +"D7" A3 c "G" B2 d2 | "D7" A3 c "G" B2 d2 |\ +"D7" A3 c "C" B2 de | "D7" dcBA "G" G4 :| diff -r daab2842258e -r 0c7ba14debe3 Session/RochdaleCoconutDance.abc --- a/Session/RochdaleCoconutDance.abc Fri Feb 14 22:38:49 2014 +0000 +++ b/Session/RochdaleCoconutDance.abc Fri Feb 14 22:39:36 2014 +0000 @@ -1,13 +1,12 @@ X: 1 T: Rochdale Coconut Dance -S: Nick Barber M: C K: G L: 1/4 Q: 160 -"G" GBGB | "D" A/G/F/G/ AB| "G" GBGB | "D" A/G/F/E/ D2 | - "G" GBGB | "D" A/G/F/G/ A d/c/ | "G" BB "D" A/B/c/A/ | "G" GBG :| -F | "Em" E/F/G/F/ EB | "Em" E/F/G/F/ EB |\ +"Em" E/F/G/F/ EB | "Em" E/F/G/F/ EB |\ "Am" c A/c/ "G" B G/A/- | "D7" A/G/ F "Em" E D | "Em" E/F/G/F/ EB | "Em" E/F/G/F/ EB | "Am" c A/c/ "G" B G/A/- |\ - "D7"A/G/ F "Em" E :| + "D7"A/G/ F "Em" E2 :| +"G" GBGB | "D" A/G/F/G/ AB| "G" GBGB | "D" A/G/F/E/ D2 | + "G" GBGB | "D" A/G/F/G/ A d/c/ | "G" BB "D" A/B/c/A/ | "G" GBG2 :|