Mercurial > hg > tony
diff src/MainWindow.cpp @ 277:2c19b0537bd2
Merge from default branch in all subrepos (after tony_integration merge in SV)
author | Chris Cannam |
---|---|
date | Wed, 14 May 2014 10:02:33 +0100 |
parents | a895c7177841 |
children | 2a18f846dd6c |
line wrap: on
line diff
--- a/src/MainWindow.cpp Wed May 14 09:51:44 2014 +0100 +++ b/src/MainWindow.cpp Wed May 14 10:02:33 2014 +0100 @@ -89,7 +89,7 @@ MainWindow::MainWindow(bool withAudioOutput, bool withOSCSupport) : - MainWindowBase(withAudioOutput, withOSCSupport, false), + MainWindowBase(withAudioOutput, false), m_overview(0), m_mainMenusCreated(false), m_playbackMenu(0),