From 1c89e7590033fcb18985ab649065bd61360fbc0e Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Sat, 13 Jun 2020 17:41:44 +0200
Subject: [PATCH] merge fixes

---
 ChangeLog    | 1 +
 src/util.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 6df598ff..1baa93cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
 
 - add new "slim channel" skin, intended for large ensembles (#339)
 
+- support sorting faders by channel instrument, coded by Alberstein8 (#356)
 
 
 
diff --git a/src/util.cpp b/src/util.cpp
index 13808bbc..b1b4ba8a 100755
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -425,6 +425,7 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
         "<p>Emlyn Bolton (<a href=""https://github.com/emlynmac"">emlynmac</a>)</p>"
         "<p>Jos van den Oever (<a href=""https://github.com/vandenoever"">vandenoever</a>)</p>"
         "<p>Tormod Volden (<a href=""https://github.com/tormodvolden"">tormodvolden</a>)</p>"
+        "<p>Alberstein8 (<a href=""https://github.com/Alberstein8"">Alberstein8</a>)</p>"
         "<p>Gauthier Fleutot Östervall (<a href=""https://github.com/fleutot"">fleutot</a>)</p>"
         "<p>Stanislas Michalak (<a href=""https://github.com/stanislas-m"">stanislas-m</a>)</p>"
         "<p>JP Cimalando (<a href=""https://github.com/jpcima"">jpcima</a>)</p>"