From 1c89e7590033fcb18985ab649065bd61360fbc0e Mon Sep 17 00:00:00 2001 From: Volker Fischer 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 ) "

Emlyn Bolton (emlynmac)

" "

Jos van den Oever (vandenoever)

" "

Tormod Volden (tormodvolden)

" + "

Alberstein8 (Alberstein8)

" "

Gauthier Fleutot Östervall (fleutot)

" "

Stanislas Michalak (stanislas-m)

" "

JP Cimalando (jpcima)

"