# HG changeset patch # User Jim Hague # Date 1403010866 -3600 # Node ID 5d272058c31a7c425f7777207ac7a1fc33caabca # Parent dfd87a88fa1900b95451921af4f4b22a401bfca4# Parent a89eba8f6dd5aee9553c09ebb8385b3016f5fc98 Automated merge with ssh://hg.cryhavoc.org.uk/dottes diff -r dfd87a88fa19 -r 5d272058c31a Session/LanigansBall.abc --- a/Session/LanigansBall.abc Tue Jun 17 13:08:09 2014 +0100 +++ b/Session/LanigansBall.abc Tue Jun 17 14:14:26 2014 +0100 @@ -4,7 +4,7 @@ H:Seamus Quinn M:6/8 L:1/8 -Q:3/8=120 +Q:180 K:Em "Em" E2E G2A|B2A Bcd| "D" D2D F2G|ABA AFD| "Em" E2E G2A|B2A Bcd|"Bm" eBB B2A| "Em" BEE E3:| diff -r dfd87a88fa19 -r 5d272058c31a Session/MidsummerWaltz.abc --- a/Session/MidsummerWaltz.abc Tue Jun 17 13:08:09 2014 +0100 +++ b/Session/MidsummerWaltz.abc Tue Jun 17 14:14:26 2014 +0100 @@ -8,10 +8,10 @@ L:1/4 Q:140 "D" D B A | "G" G2 A | B>c d | "D" A3 | "G" B B A | "Em" G2 G | "Am" A2 G | "D" F/D/-D2 | -"D" D B A | "G" G2 A | B>c d | "D" A3 | "Am" E c B | "D" A2 B | "C" G3| "G " -G3 :| +"D" D B A | "G" G2 A | B>c d | "D" A3 | "Am" E c B | "D" A2 B | "C" G3-| "G" G3 :| "G" B>A B | "Am" c>B c | "Bm" d>c d | "C" e3 | "Em" e2 d |\ "C" c2 B | "Am" A2 G | "D" F/D/-D2 | "G" B>A B | "Am" c>B c | -"Bm" d2 e | "D" A3 | "Am" E c B | "D" A2 B | "C" G3|\ -"G " -G3 | "G" B>A B | "Am" c>B c | "Bm" d>c d | "C" e3 | +"Bm" d2 e | "D" A3 | "Am" E c B | "D" A2 B | "C" G3- |\ +"G" G3 | "G" B>A B | "Am" c>B c | "Bm" d>c d | "C" e3 | "Em" e2 d | "C" c2 B | "Am" A2 G | "D" F/D/-D2 | "D" D B A |\ -"G" G2 A | "G" B>c d | "D" A3 | "Am" E c B | "D" A2 B | "C" G3| "G " -G3 |] +"G" G2 A | "G" B>c d | "D" A3 | "Am" E c B | "D" A2 B | "C" G3- | "G" G3 |] diff -r dfd87a88fa19 -r 5d272058c31a makeWeb.sh --- a/makeWeb.sh Tue Jun 17 13:08:09 2014 +0100 +++ b/makeWeb.sh Tue Jun 17 14:14:26 2014 +0100 @@ -77,6 +77,7 @@ subtitle="${subtitle} ($instrument)" fi +rm -rf $webdir mkdir -p $webdir sed -e "s/@BUILD@/$buildno/" -e "s/@SUBTITLE@/$subtitle/" \