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 (current diff) 0e1c1ea43af4 (diff)
children ef7a4c2fe274
files
diffstat 7 files changed, 15 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/Session/CaptainRock.abc	Tue Sep 10 11:13:11 2013 +0100
+++ b/Session/CaptainRock.abc	Wed Sep 11 22:30:38 2013 +0100
@@ -6,8 +6,8 @@
 Q: 140
 R: Waltz
 K: Gmaj
-D |: "G" G>AB | d>BA | "C" G>EC | "G" D/(G/G) D | "G" G>AB |
-d>BG | [1 "G" B/(d/d)B | "D" A2 D :| [2 "D" A/(B/B) A | "G" G2 d |]
-"G" d>Bd | "C" g>eg | "G" d>BG | B/(d/d) d | "G" d>Bd |
+D |: "G" G>AB | d>BA | "C" G>EC | "G" D/G/-G D | "G" G>AB |
+d>BG | [1 "G" B/d/-dB | "D" A2 D :| [2 "D" A/B/-B A | "G" G2 d |]
+"G" d>Bd | "C" g>eg | "G" d>BG | B/d/-d d | "G" d>Bd |
 "C" g>eg | "G" d>BG | "D" A2 D | "G" G>AB | d>BA |
-"C" G>EC | "G" D/(G/G)D | G>AB | d>BG | "D" A/(B/B) A | "G" G2 |]
+"C" G>EC | "G" D/G/-GD | G>AB | d>BG | "D" A/B/-B A | "G" G2 |]
--- a/Session/GatheringPeascods.abc	Tue Sep 10 11:13:11 2013 +0100
+++ b/Session/GatheringPeascods.abc	Wed Sep 11 22:30:38 2013 +0100
@@ -9,7 +9,7 @@
 Q:1/2=116
 "G" d4 d2 d2 | B3 c d2 d2 | "C" e2 d2 c2 B2 |\
    "D" A6 B2 | A2 G2 G2 F2 | [1 "G" G8 :| [2 "G" G6 G2 |]
-"D" F2 D2 F2 G2 | A4 B2 A2 | "G" GA B2 A2 G2 |\
+|: "D" F2 D2 F2 G2 | A4 B2 A2 | "G" GA B2 A2 G2 |\
    "D/F#m" F6 F2 | "A" E2 D2 E3 D  | "D" D6 d2 :|
-"G" B2 G2 G2 AB | "C" c6 c2 | "G" B2 G2 G2 AB | "C" c6 d2 |\
+|: "G" B2 G2 G2 AB | "C" c6 c2 | "G" B2 G2 G2 AB | "C" c6 d2 |\
    "G" B2 G2 G2 AB | "C" c3 d e2 dc | "G" B2 cB "D" A3 G  | "G" G6 G2 :|
--- a/Session/KingOfTheFairies.abc	Tue Sep 10 11:13:11 2013 +0100
+++ b/Session/KingOfTheFairies.abc	Wed Sep 11 22:30:38 2013 +0100
@@ -10,7 +10,7 @@
 |: "Em" (ED)uEvF (GF)vGuA | B2B2 G3 A | B2E2 (EF)GE | "D" (FG)FE D3 B, |
 "Em" (ED)EF (GF)GA | (BA)(GB) "D" d3 c | "Em" B2E2 "Bm" (GF)(ED) |\
 [1 "Em" E6 B,2 :| [2 "Em" E6 z2 |]
-"Em" e2 e2 (Bd)uevf | (ga)vguf "C" e3 f | "Em" e2 B2 (BA)uBv^c |\
+|: "Em" e2 e2 (Bd)uevf | (ga)vguf "C" e3 f | "Em" e2 B2 (BA)uBv^c |\
 "Bm" (de)d^c (Bc) (3(dcB) | "Em" e2 B2 (Bd)ef |
 (ga)gf "C" e3 f | "Em" (gf) (3(efg) "D" (fe) (3(def) |\
 "Em" e2 (ed) e3 f | g2 z e "D" f2 z d | "Em" (ed)(B^c) "Bm" d3 e |
--- a/Session/RochdaleCoconutDance.abc	Tue Sep 10 11:13:11 2013 +0100
+++ b/Session/RochdaleCoconutDance.abc	Wed Sep 11 22:30:38 2013 +0100
@@ -8,6 +8,6 @@
 "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 |\
-       "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 :|
+       "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 Sep 10 11:13:11 2013 +0100
+++ b/Session/RuftyTufty.abc	Wed Sep 11 22:30:38 2013 +0100
@@ -7,7 +7,7 @@
 K:Gmaj
 "D" d4 d2 e2| "D" f4 e2 f2 |"G" g2 g2 "D" f3 e|\
 [1 "D" d8 :| [2 "D" d6 ef |]
-"G" g2 f2 e2 d2| "D" d2 c2 "G" B3 c| "D" d2 d2 c2 B2|\
+|: "G" g2 f2 e2 d2| "D" d2 c2 "G" B3 c| "D" d2 d2 c2 B2|\
 [1 "D" A4 "G" G2 ef :| [2 "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|\
+|: "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/Springvals.abc	Tue Sep 10 11:13:11 2013 +0100
+++ b/Session/Springvals.abc	Wed Sep 11 22:30:38 2013 +0100
@@ -8,5 +8,5 @@
 K: G
 "D" D>G B2 B2 | "G" BA (Ac) c2 | "D" AFDDEF | "G" G2 BG D2 |
 "D" D>G B2 B2 | "G" BA (Ac) c2 | "D" AFDDEF [1 "G" G3 z D2 :| [2 "G" G3 D GB |]
-"D" d2 c2 (B2|A) z "G" GG G2 | "D" (FA)(DF)(AF) | "G" (GB)(BD)(GB) |
+|: "D" d2 c2 (B2|A) z "G" GG G2 | "D" (FA)(DF)(AF) | "G" (GB)(BD)(GB) |
 "D" d2 c2 (B2|A) z "G" GG G | "D" (FA)(DF)AF | [1 "G" G3 D GB :| [2 "G" G2 |]
--- a/Session/WhinshieldsHornpipe.abc	Tue Sep 10 11:13:11 2013 +0100
+++ b/Session/WhinshieldsHornpipe.abc	Wed Sep 11 22:30:38 2013 +0100
@@ -4,6 +4,7 @@
 M: C
 L: 1/8
 Q: 160
+R: hornpipe
 K: Gmaj
 dc |\
 "G" B2 G2 G2 B2 | "D7" A2 D2 D2 D2 | "G" G2 G2 GABc |\
@@ -11,7 +12,7 @@
 "G" d2 G2 G2 AB |\
 [1 "Am" c2 B2 "A7" A2 G2 | "D7" F2 A2 d2 :|\
 [2 "Am" cBAG "D7" F2 d2 | "G" G4 |]
-d2 |\
+|: d2 |\
 "G" g2>a2 gfed | B2 G2 G2 AB | "Am" cBcd cBAG |\
 "D7" F2 A2 A2 d2 | "G" g2>a2 gfed |
  B2 G2 G2 B2 | "A7" A2 A2 B2 ^c2 | "D" d4 "D7" d2 | "G" g^fgf gfed |\