Mercurial > dottes
changeset 781:a9878c2f4bb8
Merge with upstream.
| author | Jim Hague <jim.hague@acm.org> |
|---|---|
| date | Wed, 25 Apr 2018 21:51:36 +0100 |
| parents | a00e04c03e50 (current diff) 6513977d477b (diff) |
| children | 816f3154ba3e |
| files | |
| diffstat | 4 files changed, 19 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Apr 25 21:51:06 2018 +0100 +++ b/.hgtags Wed Apr 25 21:51:36 2018 +0100 @@ -125,3 +125,5 @@ 33b4d07c59071d318f19f9d7993719ac0c4ca9e5 build-default-290 d6f1f2b3bd017d58eca8d47366ed1542bd735c3f build-default-292 01e938b89e7c693c1f4d03f0622b73fa8da4f5d4 build-default-293 +43b1c2c8dbdbaadfada80df9fde028765d170040 build-default-294 +e5e64dc86731d55ececf29a9d0707109cbee6f06 build-default-295
--- a/Morris/HighlandMaryHighlandMary.abc Wed Apr 25 21:51:06 2018 +0100 +++ b/Morris/HighlandMaryHighlandMary.abc Wed Apr 25 21:51:36 2018 +0100 @@ -11,7 +11,7 @@ D2 | "G" G2 AG FE D2 | G2 AB "C" c2 Bc |\ "G" d2 de "D7" dcBA | "G" GABG "D7" D2 D2 | "G" G2 AG FE D2 | G2 AB "C" c2 Bc |\ - "G" d2 de "D7" dcBA | "G" G2 "D7" F2 "G" G2 D2 || + "G" d2 de "D7" dcBA | "G" G2 "D7" F2 "G" G2 || P:B "G" GABc "D7" d2 d2 | "C" ed cB "D7" c2 Bc |\ "G" d2 de "D7" dcBA | "G" GABG "D7" D2 D2 |
--- a/Morris/JennyLind.abc Wed Apr 25 21:51:06 2018 +0100 +++ b/Morris/JennyLind.abc Wed Apr 25 21:51:36 2018 +0100 @@ -8,7 +8,7 @@ P: A "D" F A "G" G B | "D" A f f/e/ f | "A7" G e e/d/ e |\ "D" F A d A/G/ | "D" F A "G" G B | -"D" A f f/e/ f | "A7" g c c/g/f/e/ | [1 "D" d3 A/G/ :| [2 "D" d3 ef || +"D" A f f/e/ f | "A7" g c c/g/f/e/ | [1 "D" d3 A/G/ :| [2 "D" d3 e/f/ || K: G P: B |: "C" g f e/g/f/e/ | "G" d B B/A/ B | "D7" c A A/G/ A |\
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Morris/MountainGoats.abc Wed Apr 25 21:51:36 2018 +0100 @@ -0,0 +1,15 @@ +X: 1 +T: Mountain Goats +C: Ed Pritchard +P: A.(AB)4 +M: C +K: G +L: 1/8 +Q: 130 +P: A +e^c |\ +"G" dBFB DGBG | "Am" cBAc "D" F2 FE | DFAB dcBd | "A" edd^c c4 | +"G" dBFB DGBG | "Am" cBAc egfe | "G" d^cd=c BADF | "D" GDBA "G" G2 || +P: B +"G" [AB,]2 AB "D" AFAB | d2 "C" c2 [cE]2 | E2 "C" FG ABcA | "D" e2 d2 ^c2 =c2 | +"D" d2 AB AFAB | "C" c2 A2 e2 e2 | "D" d^cd=c BAGF | "G" GABd G4 |]