changeset 652:4ca0ff535c7d

Merge with upstream.
author Jim Hague <jim.hague@acm.org>
date Mon, 21 Nov 2016 21:58:24 +0000 (2016-11-21)
parents 4e92928fcfc2 (current diff) a21702b3728c (diff)
children 6118d2a9abcc
files Session/MazurkaAvignon.abc
diffstat 4 files changed, 13 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Nov 21 21:57:15 2016 +0000
+++ b/.hgtags	Mon Nov 21 21:58:24 2016 +0000
@@ -90,3 +90,4 @@
 df9c60f6fbd742479bc974eb7937e13af5ba655a build-default-253
 061b8a3f5e70ba033c13797c62390f636736cd06 build-default-254
 1658f8c4111751558381e029a8ad072d8b03e22c build-default-255
+482a0759486f0b05d3470826bab00cfd681a9926 build-default-256
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Session/MazurkaAuvergne.abc	Mon Nov 21 21:58:24 2016 +0000
@@ -0,0 +1,11 @@
+X:1
+T: Mazurka d'Auvergne
+M:3/4
+L:1/8
+Q:120
+K:G
+"G" DG GF G2 | DB BA B2 | "Am" cB AG FG | "D" AG FE D2 |
+"G" DG GF G2 | DB BA B2 | "Am" cB AG FG | "D" AB "G" G2 :|
+(Bc) |\
+"G" d2 de dc | B2 B2 AB | "C" c2 cd cB | "D" A2 A2 (Bc) |
+"G" d2 de dc | B2 B2 AB | "Am" cB AG FG | "D" AB "G" G2 :|
--- a/Session/MazurkaAvignon.abc	Mon Nov 21 21:57:15 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-X:1
-T: Mazurka d'Avignon
-M:3/4
-L:1/8
-Q:120
-K:G
-"G" DG GF G2 | DB BA B2 | "Am" cB AG FG | "D" AG FE D2 |
-"G" DG GF G2 | DB BA B2 | "Am" cB AG FG | "D" AB "G" G2 :|
-(Bc) |\
-"G" d2 de dc | B2 B2 AB | "C" c2 cd cB | "D" A2 A2 (Bc) |
-"G" d2 de dc | B2 B2 AB | "Am" cB AG FG | "D" AB "G" G2 :|
--- a/Session/MazurkaDeLapleau.abc	Mon Nov 21 21:57:15 2016 +0000
+++ b/Session/MazurkaDeLapleau.abc	Mon Nov 21 21:58:24 2016 +0000
@@ -1,6 +1,6 @@
 X: 6
 T:Mazurka de Lapleau
-N: Dottes: Change: <MazurkaAvignon.abc>.
+N: Dottes: Change: <MazurkaAuvergne.abc>.
 M:3/4
 L:1/8
 Q:130