diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2021-06-21 13:58:14 +0200 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2021-06-21 13:58:14 +0200 |
| commit | 1f05c67eafdc40a915e31831b7305ec6057f159a (patch) | |
| tree | 47e72a18f195416089c7b4676fb1f8dd114b1ac3 /src/dialog | |
| parent | dd6928ed0d4154a8155aa3c37cf84c8571be200f (diff) | |
| parent | 32bb2d05b9d16c7aba3dee1f990a2de34f2b0463 (diff) | |
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git
# Conflicts:
# src/audio/types.h
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 f66c4a1a5e..bcd436d485 100644 --- a/src/dialog/dlgabout.cpp +++ b/src/dialog/dlgabout.cpp @@ -108,7 +108,8 @@ DlgAbout::DlgAbout(QWidget* parent) : QDialog(parent), Ui::DlgAboutDlg() { << "Javier Vilarroig" << "Balló György" << "Pino Toscano" - << "Alexander Horner"; + << "Alexander Horner" + << "Michael Ehlen"; QStringList specialThanks; specialThanks |