# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1382011895 -3600
# Node ID 8b4678e4ccdc73eb4e5ac76468c616de0cfe7e38
# Parent  eb2e0c782867c1acb187bb4cf53268ef7a659702# Parent  376f1ff3f57a0ad89c951fa2468638519e945bb6
Automated merge with ssh://hg.cryhavoc.org.uk/dottes

diff -r 376f1ff3f57a -r 8b4678e4ccdc .hgtags
--- a/.hgtags	Thu Oct 17 13:11:30 2013 +0100
+++ b/.hgtags	Thu Oct 17 13:11:35 2013 +0100
@@ -21,3 +21,7 @@
 664605b337a9c3e16f2e833fb18471cd3f571058 build-default-182
 11e0f2790a5f9fb958aad933d6cb94eec03e1bd9 build-default-183
 6ada1bc5cbeb27bf8adad84f7186f5caf14ded08 build-default-184
+16ddd82b51bcbf0a4b97c0bf919dba9e9dedc1ec build-default-185
+ab1b5b833a0c3271f6545fdf18294b97ccb0f690 build-default-186
+d97546469c3a3932029a6e050fa6dfa2eea92250 build-default-187
+1009b89a0893df09b8db9e463a05ca01430d9e94 build-default-188
diff -r 376f1ff3f57a -r 8b4678e4ccdc Session/CaptainLanoesQuickMarch.abc
--- a/Session/CaptainLanoesQuickMarch.abc	Thu Oct 17 13:11:30 2013 +0100
+++ b/Session/CaptainLanoesQuickMarch.abc	Thu Oct 17 13:11:35 2013 +0100
@@ -4,7 +4,7 @@
 L: 1/8
 Q: 160
 K: Gmaj
-"G" G2 B d2 g | "G" gfd d3 | "D" cdc "G" B2 B | "D" AGA "Em" B2 G |
-"G" G2 B d2 g | "G" gfd d3 | "D" cdc "G" B2 B | "D" AGA "G" G3 :|
+"G" G2 B d2 g | "G" gfe d3 | "D" cdc "G" B2 B | "D" AGA "Em" B2 G |
+"G" G2 B d2 g | "G" gfe d3 | "D" cdc "G" B2 B | "D" AGA "G" G3 :|
 "B" B3 B3 | "B" BAB "D" c3 | "G" B2 c d2 c | "G" B2 A B2 G |
 "Em" B3 B3 | "Em" BAB "C" c3 | "G" B2 g dBG | "D" A3 "G" G3 :|
diff -r 376f1ff3f57a -r 8b4678e4ccdc Session/LanigansBall.abc
--- a/Session/LanigansBall.abc	Thu Oct 17 13:11:30 2013 +0100
+++ b/Session/LanigansBall.abc	Thu Oct 17 13:11:35 2013 +0100
@@ -5,7 +5,7 @@
 M:6/8
 L:1/8
 Q:3/8=120
-K:G
+K:Em
 "Em" E2E G2A|B2A Bcd| "D" D2D F2G|ABA AFD|
 "Em" E2E G2A|B2A Bcd|"Bm" eBB B2A| "Em" BEE E3:|
 "Em" e2f g2e|fag fed| "D" e2f gfe|fdB Bcd|
diff -r 376f1ff3f57a -r 8b4678e4ccdc Session/Laride6.abc
--- a/Session/Laride6.abc	Thu Oct 17 13:11:30 2013 +0100
+++ b/Session/Laride6.abc	Thu Oct 17 13:11:35 2013 +0100
@@ -6,7 +6,7 @@
 N: Change: BearDance.abc
 O:France
 A:Bretagne
-K:G
+K:Em
 "Em" E2B2 | Ac B2 | "D" A> B A F | "Bm" G A B2 |
 "Em" E2B2 | Ac B2 | "D" A> B A F | "Em" G F E2 :|
 "Em" E2 "G" G2 | GE "D" F2 | F A "Bm" A F | G A "Em" B2 |
diff -r 376f1ff3f57a -r 8b4678e4ccdc Session/ThemeVannetaise.abc
--- a/Session/ThemeVannetaise.abc	Thu Oct 17 13:11:30 2013 +0100
+++ b/Session/ThemeVannetaise.abc	Thu Oct 17 13:11:35 2013 +0100
@@ -3,7 +3,7 @@
 T: Twiglet
 O: Brittany
 M: 4/4
-K: G
+K: Em
 L: 1/8
 Q: 140
 "Em" E2 B2 B2 AB | G2 E2 E2 FG | "D" A2 AG F2 FE | DE FA "B" G2 F2 |
diff -r 376f1ff3f57a -r 8b4678e4ccdc dottes.html.learnertune
--- a/dottes.html.learnertune	Thu Oct 17 13:11:30 2013 +0100
+++ b/dottes.html.learnertune	Thu Oct 17 13:11:35 2013 +0100
@@ -33,11 +33,11 @@
         <div class="dottes-tune-header">
           <div class="dottes-tune-header-row">
             <div class="dottes-tune-header-left">
-              <a href="@TUNE@.html">
+              <a class="dottes-tune-icon-link" href="@TUNE@.html">
                 <img class="dottes-tune-table-image" src="../img/music.png"
                      alt="Dottes">
               </a>
-              <a href="index.html">
+              <a class="dottes-tune-icon-link" href="index.html">
                 <img class="dottes-tune-table-image" src="../img/book.png"
                      alt="Tune index">
               </a>
diff -r 376f1ff3f57a -r 8b4678e4ccdc dottes.html.tune
--- a/dottes.html.tune	Thu Oct 17 13:11:30 2013 +0100
+++ b/dottes.html.tune	Thu Oct 17 13:11:35 2013 +0100
@@ -24,11 +24,11 @@
         <div class="dottes-tune-header">
           <div class="dottes-tune-header-row">
             <div class="dottes-tune-header-left">
-              <a href="learner-@TUNE@.html">
+              <a class="dottes-tune-icon-link" href="learner-@TUNE@.html">
                 <img class="dottes-tune-table-image" src="../img/learner.png"
                      alt="Learner">
               </a>
-              <a href="index.html">
+              <a class="dottes-tune-icon-link" href="index.html">
                 <img class="dottes-tune-table-image" src="../img/book.png"
                      alt="Tune index">
               </a>
diff -r 376f1ff3f57a -r 8b4678e4ccdc web/css/dottes.css
--- a/web/css/dottes.css	Thu Oct 17 13:11:30 2013 +0100
+++ b/web/css/dottes.css	Thu Oct 17 13:11:35 2013 +0100
@@ -208,6 +208,11 @@
     top: 12px;
 }
 
+a.dottes-tune-icon-link
+{
+    text-decoration: none;
+}
+
 ul.tune-type-list
 {
     list-style-type: none;
diff -r 376f1ff3f57a -r 8b4678e4ccdc web/img/learner.png