# HG changeset patch
# User Chris Cannam
# Date 1592842097 -3600
# Node ID e55433e351cd1be2d0ec6c6313964446d2705021
# Parent  27007726ccd23e4bf8814412f4571b30eaab8ba7# Parent  bf0a885effb0d159e017fa2242d4fce0ad35a595
Merge from branch startup-timing

diff -r bf0a885effb0 -r e55433e351cd .hgtags
--- a/.hgtags	Tue Jun 16 18:06:58 2020 +0100
+++ b/.hgtags	Mon Jun 22 17:08:17 2020 +0100
@@ -105,3 +105,8 @@
 90da8fead9495edf5aae369cfed7c2d0916a125f sv_v4.0
 7cb68e49b64ccbdd005a516c3cfb8a0f5ce092e1 sv_v4.0.1
 367561a2ac8533f67155bbedba1adcade83e218c sv_v4.1pre1
+7e8a766af655f677f1533bde620f6b874747edbc sv_v4.1
+7e8a766af655f677f1533bde620f6b874747edbc sv_v4.1
+db7392b78cdac752e9c9e6ddbc2f288acdd3fe73 sv_v4.1
+db7392b78cdac752e9c9e6ddbc2f288acdd3fe73 sv_v4.1
+fa3218d9fe97133b99dc8da424d0f167d5bed378 sv_v4.1
diff -r bf0a885effb0 -r e55433e351cd CHANGELOG
--- a/CHANGELOG	Tue Jun 16 18:06:58 2020 +0100
+++ b/CHANGELOG	Mon Jun 22 17:08:17 2020 +0100
@@ -1,5 +1,5 @@
 
-Changes in Sonic Visualiser v4.1 (May 2020) since the previous release 4.0.1:
+Changes in Sonic Visualiser v4.1 (18 June 2020) since the previous release 4.0.1:
 
  - Support "dark mode" on Windows and Linux as well as macOS
 
@@ -10,6 +10,8 @@
  - Provide format options when exporting layers to CSV, allowing
    control over column separator, header row, and timestamp format
 
+ - Permit and handle optional header row when importing from CSV
+
  - Add export of spectrogram data to CSV formats
 
  - Support doubling escapes for quotes in quoted CSV fields on import
diff -r bf0a885effb0 -r e55433e351cd repoint-lock.json
--- a/repoint-lock.json	Tue Jun 16 18:06:58 2020 +0100
+++ b/repoint-lock.json	Mon Jun 22 17:08:17 2020 +0100
@@ -4,10 +4,10 @@
       "pin": "0e32c328b02a"
     },
     "svcore": {
-      "pin": "cb9209ef373a"
+      "pin": "258e356b1a7b"
     },
     "svgui": {
-      "pin": "a6e37c28d762"
+      "pin": "fe9a643b83bf"
     },
     "svapp": {
       "pin": "7bded7599874"
diff -r bf0a885effb0 -r e55433e351cd repoint-project.json
--- a/repoint-project.json	Tue Jun 16 18:06:58 2020 +0100
+++ b/repoint-project.json	Mon Jun 22 17:08:17 2020 +0100
@@ -16,8 +16,7 @@
         },
         "svcore": {
             "vcs": "hg",
-            "service": "soundsoftware",
-            "branch": "startup-timing"
+            "service": "soundsoftware"
         },
         "svgui": {
             "vcs": "hg",