Mercurial > hg > tony

changeset 277:2c19b0537bd2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 cacf3fdf8208
children 28437904bd38
files .hgsubstate src/MainWindow.cpp
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Wed May 14 09:51:44 2014 +0100
+++ b/.hgsubstate	Wed May 14 10:02:33 2014 +0100
@@ -2,6 +2,6 @@
 236814e07bd07473958c1ff89103124536a0c3c8 dataquay
 d1f89559321a4a194bf98c43bb1df88c82ce1078 pyin
 27d4e7152c954bf3c4387319db088fb3cd02436b sv-dependency-builds
-63dec7dc11cc9edf74770268bf617619c4f5b3c8 svapp
-68e880e0b85772099d0fad111266141493369cd8 svcore
-6388ddae6ce3b5ddaeb5a39221e680e0327e55cb svgui
+36efd75d7b7b1bb88dbe6c15992b1ffe3e40d452 svapp
+2175c2ebd5c6ff89360cd0904ecd46b11914df45 svcore
+986f1670a5025f9773ec3348a833392b601ae6a0 svgui
--- 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),