# HG changeset patch
# User Chris Cannam
# Date 1394561381 0
# Node ID 9cc2027d388bfd09f859beb743a35da7f3db33ba
# Parent  959f01137742767a13614632a847d51c298ea247
Update to current state of tonioni and default branches

diff -r 959f01137742 -r 9cc2027d388b .hgsubstate
--- a/.hgsubstate	Tue Jan 28 15:17:06 2014 +0000
+++ b/.hgsubstate	Tue Mar 11 18:09:41 2014 +0000
@@ -1,5 +1,5 @@
 236814e07bd07473958c1ff89103124536a0c3c8 dataquay
 3c5adc4a864fa75e5b1e67c260b77541aaa4f1f6 sv-dependency-builds
-28c17ce7a6e976d3bddc11f520b6f5715083393f svapp
-862fe7b20df76ec3e57d1110c5a064940ae5de35 svcore
-e5f4385615ac87c8cc9d93fd453b0f91add6a486 svgui
+b2ca08d16293805f4e4b6e135a659efe8fd1fe95 svapp
+8962f80f5d8e7f28fb9268c02409416d7828cca2 svcore
+b6dc57688c72ae31cc7825cef0cf68d5d698c0aa svgui
diff -r 959f01137742 -r 9cc2027d388b main/OSCHandler.cpp
--- a/main/OSCHandler.cpp	Tue Jan 28 15:17:06 2014 +0000
+++ b/main/OSCHandler.cpp	Tue Mar 11 18:09:41 2014 +0000
@@ -349,7 +349,7 @@
                 if (value < 0.5) {
                     m_viewManager->setOverlayMode(ViewManager::NoOverlays);
                 } else if (value < 1.5) {
-                    m_viewManager->setOverlayMode(ViewManager::MinimalOverlays);
+                    m_viewManager->setOverlayMode(ViewManager::StandardOverlays);
                 } else {
                     m_viewManager->setOverlayMode(ViewManager::AllOverlays);
                 }