eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge fixes

Browse source
This commit is contained in:
Volker Fischer 2020-05-28 19:05:35 +02:00
parent e3865dacd0
commit 16187529ea
4 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -7,6 +7,9 @@
- added check in acknowledge message, coded by atsampson (#302) - added check in acknowledge message, coded by atsampson (#302)
- bug fix: on MacOS declare an activity to ensure the process doesn't get throttled
by OS level Nap, Sleep, and Thread Priority systems, coded by AronVietti (#23)

2
mac/activity.h
View file

@ -2,7 +2,7 @@
* Copyright (c) 2004-2020 * Copyright (c) 2004-2020
* *
* Author(s): * Author(s):
* Volker Fischer * AronVietti
* *
****************************************************************************** ******************************************************************************
* *

2
mac/activity.mm
View file

@ -2,7 +2,7 @@
* Copyright (c) 2004-2020 * Copyright (c) 2004-2020
* *
* Author(s): * Author(s):
* Volker Fischer * AronVietti
* *
****************************************************************************** ******************************************************************************
* *

1
src/util.cpp
View file

@ -396,6 +396,7 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
"<p>Tarmo Johannes (<a href=""https://github.com/tarmoj"">tarmoj</a>)</p>" "<p>Tarmo Johannes (<a href=""https://github.com/tarmoj"">tarmoj</a>)</p>"
"<p>mirabilos (<a href=""https://github.com/mirabilos"">mirabilos</a>)</p>" "<p>mirabilos (<a href=""https://github.com/mirabilos"">mirabilos</a>)</p>"
"<p>newlaurent62 (<a href=""https://github.com/newlaurent62"">newlaurent62</a>)</p>" "<p>newlaurent62 (<a href=""https://github.com/newlaurent62"">newlaurent62</a>)</p>"
"<p>AronVietti (<a href=""https://github.com/AronVietti"">AronVietti</a>)</p>"
"<p>Emlyn Bolton (<a href=""https://github.com/emlynmac"">emlynmac</a>)</p>" "<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>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>Tormod Volden (<a href=""https://github.com/tormodvolden"">tormodvolden</a>)</p>"