# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1404118969 -3600
# Node ID b6e4f4d7665ab4b830abf087d8826b3c11961768
# Parent  56ddc6ef7b1afbc6be5c3ad3e6a2c19c24ab5cae# Parent  4cc739fe13ab42a249b569e89501ccab66a96888
Automated merge with ssh://hg.cryhavoc.org.uk/dottes

diff -r 4cc739fe13ab -r b6e4f4d7665a .hgtags
--- a/.hgtags	Mon Jun 30 10:01:51 2014 +0100
+++ b/.hgtags	Mon Jun 30 10:02:49 2014 +0100
@@ -45,3 +45,6 @@
 4fab69a1027d6188a66a81f7d7f2925e1292d924 build-default-207
 e16c20e63d9c5141e701ff5152605445f380735e build-default-209
 825d7b3d2ebd81ca16543acb94b5888b9489865f build-default-210
+f724174fb1e9a6316d1b55745d9fe0597e6afd1f build-default-211
+8e835e4de9fe5092ac6734d36b9a345e5c85b2f3 build-default-212
+242d3ef49ecb15ba0190e095f78492f8d3f8e7cc build-default-213
diff -r 4cc739fe13ab -r b6e4f4d7665a Library/BattleOfTheSomme.abc
--- a/Library/BattleOfTheSomme.abc	Mon Jun 30 10:01:51 2014 +0100
+++ b/Library/BattleOfTheSomme.abc	Mon Jun 30 10:02:49 2014 +0100
@@ -5,7 +5,7 @@
 M: 9/8
 L: 1/8
 K: G
-Q: 130
+Q: 120
 d>c |\
 "G" BdB G3 GFG | "D" AGE E3  D3 | "C" EGE D3 G3 | "D" BdB A3- Ad>c |\
 "G" BdB G3 GFG | "D" AGE E3  D3 | "C" EGE D3 B3 | "D" ABA G3- G   :|
diff -r 4cc739fe13ab -r b6e4f4d7665a Library/Butterfly.abc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Library/Butterfly.abc	Mon Jun 30 10:02:49 2014 +0100
@@ -0,0 +1,16 @@
+X:1
+T:Butterfly, The
+R:Slip Jig
+M:9/8
+L:1/8
+Q:1/4=150
+K:Emin
+"Em" B2 E G2 E "D" F3 | "Em" B2 E G2 E "D" FED |\
+"Em" B2 E G2 E "D" F3 | "G" B3 d2 B "D" AFD :|
+"Em" B2 d e2 f g3 | B3 g2 e dBA | B2 d e2 f g2 a | "G" b2 a g2 e "D" dBA :|
+"Em" B3 B2 A "D" G2 A | "Em" B3 BAB "D" dBA |\
+"Em" B3 B2 A "D" G2 A | "G" B3 g2 e "D" dBA :|
+%%begintext
+Ending
+%%endtext
+"Em" B2 E G2 E "D" FED | "Em" E6 z3 |]