merge fixes
This commit is contained in:
parent
36ca0bab1f
commit
a2a489e6f0
2 changed files with 2 additions and 0 deletions
|
@ -13,6 +13,7 @@
|
|||
|
||||
- support for storing/recovering the server window positions (#357)
|
||||
|
||||
- add a headless build type which does not depend on QtGui/QtWidgets, coded by marcan (#322)
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -421,6 +421,7 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
|
|||
"<p>Olivier Humbert (<a href=""https://github.com/trebmuh"">trebmuh</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>Hector Martin (<a href=""https://github.com/marcan"">marcan</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>"
|
||||
|
|
Loading…
Reference in a new issue