From a2a489e6f0c0399f9cd72ce582aeeda82749e10a Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Wed, 17 Jun 2020 19:26:24 +0200
Subject: [PATCH] merge fixes

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

diff --git a/ChangeLog b/ChangeLog
index 203b40e5..f453a3ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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)
 
 
 
diff --git a/src/util.cpp b/src/util.cpp
index 65fcebe7..d039d802 100755
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -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>"