changeset 493:5d272058c31a

Automated merge with ssh://hg.cryhavoc.org.uk/dottes
author Jim Hague <jim.hague@acm.org>
date Tue, 17 Jun 2014 14:14:26 +0100
parents dfd87a88fa19 (current diff) a89eba8f6dd5 (diff)
children 825d7b3d2ebd
files
diffstat 3 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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:|
--- 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 |]
--- 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/" \