From cbdd93f36e732873f73f5b8256c5d0fc64d85039 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Mon, 1 Jun 2020 22:28:47 +0200
Subject: [PATCH] merge fix

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

diff --git a/ChangeLog b/ChangeLog
index 2dcae62c..a8a167b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
 
 - enable/disable recording from command line, coded by pljones (#228)
 
+- make level meter LED black when off, by fleutot (#318)
+
 - added check in acknowledge message, coded by atsampson (#302)
 
 - bug fix: on MacOS declare an activity to ensure the process doesn't get throttled
diff --git a/src/util.cpp b/src/util.cpp
index c6fdd82f..e2eda381 100755
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -400,6 +400,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>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>"
         "<p>Adam Sampson (<a href=""https://github.com/atsampson"">atsampson</a>)</p>"