# HG changeset patch
# User matthiasm
# Date 1400693682 -3600
# Node ID 28437904bd38458125043b4d6a711a9989510afb
# Parent  c01dd6ee127cf8ad25722f85b5a6e95a3ca4d039# Parent  2c19b0537bd2d2b97e52be20f89b5871d160d5f3
merge

diff -r c01dd6ee127c -r 28437904bd38 .hgsubstate
--- a/.hgsubstate	Wed May 21 18:34:10 2014 +0100
+++ b/.hgsubstate	Wed May 21 18:34:42 2014 +0100
@@ -2,6 +2,6 @@
 236814e07bd07473958c1ff89103124536a0c3c8 dataquay
 d1f89559321a4a194bf98c43bb1df88c82ce1078 pyin
 27d4e7152c954bf3c4387319db088fb3cd02436b sv-dependency-builds
-63dec7dc11cc9edf74770268bf617619c4f5b3c8 svapp
-ecb34638ce1ba82cc47e9d12693d7b19a04ef9e1 svcore
-8c2dfb4d6c7ae0dc8cf7a3db8198c7d17abe8a4a svgui
+36efd75d7b7b1bb88dbe6c15992b1ffe3e40d452 svapp
+2175c2ebd5c6ff89360cd0904ecd46b11914df45 svcore
+986f1670a5025f9773ec3348a833392b601ae6a0 svgui
diff -r c01dd6ee127c -r 28437904bd38 .hgtags
--- a/.hgtags	Wed May 21 18:34:10 2014 +0100
+++ b/.hgtags	Wed May 21 18:34:42 2014 +0100
@@ -8,3 +8,5 @@
 fc04fd860d7fceaee2c3fe1bfbd1d2b63a44c12b v0.4
 e0337a99285d0efe486025184bd1a3f0752dc1dd v0.4_win32_build
 29455a21880ef7e60ac0b23beee34262e92a0284 v0.5
+29455a21880ef7e60ac0b23beee34262e92a0284 v0.5
+846df0ea9c82206ed9185536d7d3eab35eb68b07 v0.5
diff -r c01dd6ee127c -r 28437904bd38 src/MainWindow.cpp
--- a/src/MainWindow.cpp	Wed May 21 18:34:10 2014 +0100
+++ b/src/MainWindow.cpp	Wed May 21 18:34:42 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),