diff .hgsubstate @ 362:ca53880fa3ca

Merge from default branch, and update to make sure we retain the DAW-style scrolling (page without moving playhead on scroll)
author Chris Cannam
date Wed, 02 Jul 2014 19:22:05 +0100
parents bcfc21bcc973
children fec4dafd9093
line wrap: on
line diff
--- a/.hgsubstate	Thu Jun 19 14:52:37 2014 +0100
+++ b/.hgsubstate	Wed Jul 02 19:22:05 2014 +0100
@@ -2,6 +2,6 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 e637cf9160029c6d429bf89fedca157619ca8da8 pyin
 553a5f65ef64811747a6613f759622d655db63c1 sv-dependency-builds
-1162c93e76880751100f7bf42969fa9b5176e13c svapp
-f960d67ce84237be28902f24d5c757a72dc8004b svcore
-b68af2be4545adf04eec58c50d8419dc574b8642 svgui
+d8bde801ebd40d722df379eee3b40729d3b78380 svapp
+178ffa964096f32ace219b21e0fb2e7e71bde1a2 svcore
+24f18a7dd26d0cb175adfa807b606ace84795327 svgui