merge fix

This commit is contained in:
Volker Fischer 2020-06-01 22:28:47 +02:00
parent ca94e9f878
commit cbdd93f36e
2 changed files with 3 additions and 0 deletions

View file

@ -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

View file

@ -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>"