diff options
| author | kain88 <kain88@mixxx.org> | 2013-12-04 23:22:43 +0100 |
|---|---|---|
| committer | kain88 <kain88@mixxx.org> | 2013-12-04 23:22:43 +0100 |
| commit | 06fc481aeafc9c3e1f28400bf8e9b0930c983e1a (patch) | |
| tree | d0dfd76da31db2a3a6d1f82324e6f180390fed90 /src/dlgpreferences.cpp | |
| parent | c8be27d612347e69dc3de704fbab5e490472a4a3 (diff) | |
| parent | 334a38fdb6e7f6b9bc73b0e9de08fb8f5c5c2606 (diff) | |
Merge remote-tracking branch 'upstream/master' into multiplyFolders
Conflicts:
src/dlgprefplaylist.cpp
src/dlgprefplaylistdlg.ui
Diffstat (limited to 'src/dlgpreferences.cpp')
| -rwxr-xr-x | src/dlgpreferences.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/dlgpreferences.cpp b/src/dlgpreferences.cpp index f26c8bfd89..2c8110ca8b 100755 --- a/src/dlgpreferences.cpp +++ b/src/dlgpreferences.cpp @@ -18,7 +18,6 @@ #include <QTabWidget> #include <QTabBar> #include <QDialog> -#include <QtGui> #include <QEvent> #include <QScrollArea> #include <QDesktopWidget> @@ -63,7 +62,6 @@ DlgPreferences::DlgPreferences(MixxxApp * mixxx, SkinLoader* pSkinLoader, contentsTreeWidget->setHeaderHidden(true); #endif - setWindowTitle(tr("Preferences")); createIcons(); while (pagesWidget->count() > 0) { |