# HG changeset patch # User Chris Cannam # Date 1470405902 -3600 # Node ID 7ac7ca14ede2cdfbef0f43d3afcda1dba5e793e9 # Parent 85f43ad71e9754da660cebcef1f157f4828b2adb# Parent a81189c441893e414425ea3b3db8359ae7466640 Merge work on unified spectrogram and colour 3d plot caching renderer diff -r 85f43ad71e97 -r 7ac7ca14ede2 .hgsubstate --- a/.hgsubstate Mon Jun 13 12:28:13 2016 +0100 +++ b/.hgsubstate Fri Aug 05 15:05:02 2016 +0100 @@ -2,10 +2,10 @@ 28f51eb8bf2dd985b0c1a6d704fb65e14c2f0f25 bqresample a518ddd9dd68917393887d28dfee6221bc37fb66 bqvec 9f62684e1911c4184e7b97ba3a0673cb0464f3a2 checker -d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay +896aefe629c85b05ae0880ec93a396b9e3a5a304 dataquay 68ae618c6b0e442d08a71d39217784a08f2a8de3 icons/scalable 1e4f338ae482429a7ab9bdd0825242042354152f sv-dependency-builds c3648c667a0bb9004c97f1997dca22b79c419e12 svapp -69c84a66727b69b57e27053c9fa28ec205bc0ec1 svcore -b4fd6c67fce5bb3a71020ad825dddafae1265f0b svgui +3b84f9bd0048179ea09cec4e30f1fc5c76a6eb82 svcore +74f2706995b71da2410041db01d34ee3c413c50a svgui 9a2998401bbe0a7b9e3233eeca5004542bc0014d vamp-plugin-sdk