diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2021-06-16 23:28:08 +0200 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2021-06-16 23:28:08 +0200 |
| commit | ed6ab125197428ac8a38092f461f317643d3e8e1 (patch) | |
| tree | 5d5b1eb0c14a218980857d9185965077dc7d21d4 /src/dialog | |
| parent | 513da6dd21621ac10ecd74988d61e55eb517e6ba (diff) | |
| parent | 09f6df740694d07b2e7d520621827dc05aeb74ec (diff) | |
Merge remote-tracking branch 'upstream/2.3' into main
# Conflicts:
# src/dialog/dlgabout.cpp
Diffstat (limited to 'src/dialog')
| -rw-r--r-- | src/dialog/dlgabout.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dialog/dlgabout.cpp b/src/dialog/dlgabout.cpp index 5210fa95a1..f66c4a1a5e 100644 --- a/src/dialog/dlgabout.cpp +++ b/src/dialog/dlgabout.cpp @@ -107,7 +107,8 @@ DlgAbout::DlgAbout(QWidget* parent) : QDialog(parent), Ui::DlgAboutDlg() { << "Al Hadebe" << "Javier Vilarroig" << "Balló György" - << "Pino Toscano"; + << "Pino Toscano" + << "Alexander Horner"; QStringList specialThanks; specialThanks |