Merge pull request #332 from calband/prep_for_3_6_1

All the prep for CalChart 3.6.1

Author: rmpowell77

CMakeLists.txt

@@ -12,7 +12,7 @@ project (CalChart)
 
 set (CalChart_VERSION_MAJOR 3)
 set (CalChart_VERSION_MINOR 6)
-set (CalChart_VERSION_PATCH 0)
+set (CalChart_VERSION_PATCH 1)
 
 set (CalChart_VERSION "${CalChart_VERSION_MAJOR}.${CalChart_VERSION_MINOR}.${CalChart_VERSION_PATCH}")
 

README.md

@@ -69,7 +69,25 @@ If you need to regenerate the help documentation, see the [README-docs.txt](READ
 
 # Release notes
 
-## Release notes for 3.6
+## Release notes for 3.6.1
+
+Features addressed in this release:
+
+* [#326](../../issues/326) Improving click and drag by not unselecting groups.
+* [#327](../../issues/327) Adding sprites to Animation screen.
+* [#331](../../issues/331) Adding ability to label Instruments
+
+Bugs addressed in this release:
+
+* [#323](../../issues/323) cannot open old calchart files when they have images.
+* [#324](../../issues/324) Transition solver doesn't seem to add groups on Windows.
+* [#328](../../issues/328) Point picker crashes if you open, close then quit a show
+
+Other changes:
+
+* [#322](../../issues/322) Increment wxWidgets to 3.1.4
+
+## Release notes for 3.6.0
 
 Features addressed in this release:
 

RELEASE_INSTRUCTIONS.txt

@@ -8,7 +8,7 @@ Checklist
 
 How to release calchart:
 
-The current calchart version is 3.6.0.  In all commands below, substitute that number for $CCVER (meaning when you read $CCVER, type 3.6.0)
+The current calchart version is 3.6.1.  In all commands below, substitute that number for $CCVER (meaning when you read $CCVER, type 3.6.1)
 
 0.1 Increment the CalChart_VERSION in CMakeLists.txt to CCVER
 
@@ -58,14 +58,14 @@ The final product is build/CalChart-$CCVER.dmg
 ---
 
 2. Tag the depot
-$ git tag -a v3.6.0 -m "calchart-3.6.0"
-$ git push origin v3.6.0
+$ git tag -a v3.6.1 -m "calchart-3.6.1"
+$ git push origin v3.6.1
 
 3. Go to a temporary directory on your system to recheck at the tag.  This is to avoid having any unwanted files
 $ cd /tmp
 $ git clone --recursive https://github.com/calband/calchart.git calchart
 $ cd calchart
-$ git checkout v3.6.0
+$ git checkout v3.6.1
 
 4. Rebuild the release now that you have the tag (repeat instructions for step 1)
 

src/basic_ui.h

@@ -46,7 +46,7 @@ static constexpr auto kInstruments = {
     "Mello",
     "Trombone",
     "Baritone",
-    "Basses",
+    "Sousaphone",
     "Snare",
     "Bass Drum",
     "Quad Drum",