Mercurial > dottes
changeset 166:7e5c8115a3b7
Merge local changes.
author | Jim Hague <jim.hague@laicatc.com> |
---|---|
date | Wed, 28 Nov 2012 22:47:07 +0000 |
parents | ddd413544973 (diff) 63a235220d9e (current diff) |
children | 416adac6a895 |
files | |
diffstat | 9 files changed, 22 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/Morris/Shooting.abc Tue Aug 07 16:55:17 2012 +0100 +++ b/Morris/Shooting.abc Wed Nov 28 22:47:07 2012 +0000 @@ -4,8 +4,11 @@ A: Adderbury M: 9/8 L: 1/8 +P: 6(2A.3B) K: G -D | "G" G2 G BAG B<dD | GDG B2 "D" A A2 D |\ - "G" G2 G BAG B<dD | GDG B2 "D" A "G" G3 :| +P: A +"" D | "G" G2 G BAG B<dD | GDG B2 "D" A A2 D |\ + "G" G2 G BAG B<dD | GDG B2 "D" A "G" G3 :| +P: B "G" d2 c B>AG B/d-d | "D" A2 A A2 "G" B "D" c3 |\ "G" d2 c B>AG B/ d2 | GDG B2 "D" A "G" G3 :|
--- a/Session/ElizabethClare.abc Tue Aug 07 16:55:17 2012 +0100 +++ b/Session/ElizabethClare.abc Wed Nov 28 22:47:07 2012 +0000 @@ -6,12 +6,12 @@ L: 1/8 R: waltz K: Gmaj - D GA | "G" B2 Bc B2 |"D" A2ABA2 |"C" G2E2D2 |"G" D2>D2 GA|\ + D GA | "G" B2 Bc B2 |"D" A2ABA2 |"C" G2E2GE |"G" D2>D2 GA|\ "G" B2 d2 e2 | d2 c2 B2 | d2 c2 B2 | -"D" A2>D2 GA | "G" B2 Bc B2 | "D" A2ABA2 | "C" G2E2D2 | "G" D2>D2 GA|\ +"D" A2>D2 GA | "G" B2 Bc B2 | "D" A2ABA2 | "C" G2E2GE | "G" D2>D2 GA|\ "G" B2 d2 e2 | d2 c2 B2 | "D" A2 G2 F2 | "G "G3 :| G Bd | "C" e2 d2>B2 | c2 B2 Bc | "G" d2 c2 B2 | "D" A4 B2 |\ "C" c2 cd c2 | "G" B2 Bc B2 | "Am" A2 G2 E2 | -"D" D2>D2 GA | "G" B2 Bc B2 | "D" A2 AB A2 | "C" G2 E2 D2 |\ +"D" D2>D2 GA | "G" B2 Bc B2 | "D" A2 AB A2 | "C" G2 E2 G E |\ "G" D2>D2 GA | "G" B2 d2 e2 | d2 c2 B2 | "D" A2 G2 F2 | "G" G3 :|
--- a/Session/HorsesBrawl.abc Tue Aug 07 16:55:17 2012 +0100 +++ b/Session/HorsesBrawl.abc Wed Nov 28 22:47:07 2012 +0000 @@ -9,8 +9,8 @@ Q:1/4=180 K:G "G" G>A B B | "D" c B A c | "G" B A G F | "C" E2 "D" D2 |\ -"G" G>A B B | "D" c B A c | "Em" B G "D" A F | "C" G2 G2 :| +"G" G>A B B | "D" c B A c | "Em" B G "D" A F | "G" G2 G2 :| |: "D" d c/B/ A "G" B | "D" c B/A/ "G" G/A/ B | "D" A G F "G" G | "D" A2 A2 |\ d c/B/ A "G" B | "D" c B/A/ "G" G/A/ B | "D" A G G F | "G" G2 G2 :| -|: "Em" B A/G/ B A/G/ | "D" F G A2 | D E F G | A B A G |\ - "Em" B A/G/ B A/G/ | "D" F G A2 | D E F G | G F "G" G2 :| +|: "Em" _B A/G/ B A/G/ | "D" F G A2 | D E F G | A B A G |\ + "Em" _B A/G/ B A/G/ | "D" F G A2 | D E F G | G F "G" G2 :|
--- a/Session/LeCanalEnOctobre.abc Tue Aug 07 16:55:17 2012 +0100 +++ b/Session/LeCanalEnOctobre.abc Wed Nov 28 22:47:07 2012 +0000 @@ -15,4 +15,4 @@ [2 "G" (G2G/)A/B/c/ \ |: "Bm" d d "D" c/B/A/G/ | "Bm" d d "D" c/B/A/G/ | "Em" E/F/G/B/ "D" A>G | "D" F/G/E/F/ D2 |\ -"Bm" d d "D" c/B/A/G/ | "Bm" d d "D" c/B/A/G/ | "Em" E/F/G/B/ A>G | G4 :| +"Bm" d d "D" c/B/A/G/ | "Bm" d d "D" c/B/A/G/ | "Em" E/F/G/B/ "D" A>G | "G" G4 :|
--- a/Session/MichaelTurnersWaltz.abc Tue Aug 07 16:55:17 2012 +0100 +++ b/Session/MichaelTurnersWaltz.abc Wed Nov 28 22:47:07 2012 +0000 @@ -7,7 +7,7 @@ K: Gmaj P: A |:DGA | "G" B2 BD "D" cD | "G" d4 gf | "C" e2>f2 ge | "D" d2>D2 GA | - "G" B2 BD "D" cD | "G" d2>e2 cA | "G" G2 GB "D" AF | G3 :| + "G" B2 BD "D" cD | "G" d2>e2 cA | "G" G2 GB "D" AF | "G" G3 :| P: B |: zAB | "D" c2>d2 cB | "D" A4 Bc | "Bm" d2>e2 dc | "G" B4 gf | "C" e2>f2 ge | "D" d2>D2 GA | "G" B2 Bc "D" AB | "G" G3 :|
--- a/Session/PlaneTree.abc Tue Aug 07 16:55:17 2012 +0100 +++ b/Session/PlaneTree.abc Wed Nov 28 22:47:07 2012 +0000 @@ -2,6 +2,7 @@ T: Plane Tree, The C: Undine Hornby S: Nick Barber +N: Change: Herbert the Sherbert M: 6/8 L: 1/8 R: jig
--- a/Session/RochdaleCoconutDance.abc Tue Aug 07 16:55:17 2012 +0100 +++ b/Session/RochdaleCoconutDance.abc Wed Nov 28 22:47:07 2012 +0000 @@ -11,6 +11,6 @@ "G" GBGB | "D" A/G/F/G/ A d/c/ | "G" BB "D" A/B/c/A/ | "G" GBG :| P: B |: F | "Em" E/F/G/F/ EB | "Em" E/F/G/F/ EB |\ - "Am" c A/c/ "G" B G/(A/| "B7" A/)G/ F "Em" E D | + "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 :|
--- a/Session/RuftyTufty.abc Tue Aug 07 16:55:17 2012 +0100 +++ b/Session/RuftyTufty.abc Wed Nov 28 22:47:07 2012 +0000 @@ -7,7 +7,7 @@ K:Gmaj "D" d4 d2 e2| "D" f4 e2 f2 |"G" g2 g2 "D" f3 e| "D" d8| "D" d4 d2 e2| "D" f4 e2 f2| "G" g2 g2 "D" f3 e| "D" d6 || -|: ef| "G" g2 f2 e2 d2| "G" d2 c2 B3 c| "D" d2 d2 c2 B2| "D" A4 "G" G2 ef| - "G" g2 f2 e2 d2| "G" d2 c2 B3 c| "D" d2 d2 c2 B2| "D" A4 "G" G4 :| +ef| "G" g2 f2 e2 d2| "G" d2 c2 B3 c| "D" d2 d2 c2 B2| "D" A4 "G" G2 ef| + "G" g2 f2 e2 d2| "G" d2 c2 B3 c| "D" d2 d2 c2 B2| "D" A4 "G" G4 || |: "G" B3 c d2 d2| "C" e2 c2 "D" d4| "G" B3 c d2 d2| "C" e2 c2 "D" d2 Bc|\ "D" d2 d2 c2 B2| "D" A4 "G" G4:|
--- a/Session/SoldiersJoy.abc Tue Aug 07 16:55:17 2012 +0100 +++ b/Session/SoldiersJoy.abc Wed Nov 28 22:47:07 2012 +0000 @@ -1,10 +1,11 @@ X: 1 T: Soldier's Joy +T: The Forester M: 4/4 L: 1/8 R: hornpipe K: Dmaj -|:AFDF AFDF|A2 d2 d2 cB|AFDF AFDF|G2E2 E2 FG| -|AFDF AFDF|A2 d2 d2 de|fafd egec|d2 d2 d4:| -|:fdfd fagf|edcd efge|fdfd fagf|edcB A2 de| -| fdfd fagf| ecAc efge| fafd egec|d2 d2 d4:|| +|: FG | "D" AFDF AFDF|A2 d2 "G" d2 cB| "D" AFDF AFDF| "E7" G2E2 "A7" E2 FG| +| "D" AFDF AFDF|A2 d2 "G" d2 de| "D" fafd "A7" egec| "D" d2 d2 d2 :| +|: de | "D" f2 fd fagf| "A7" e2 cd efge| "D" f2 fd fagf | "E7" edcB "A" A2 de| +| "D" fdfd fagf| "Em" ecAc "A7" efge| "D" fafd "A7" egec| "D" d2 d2 d2 :||