# HG changeset patch
# User Chris Cannam
# Date 1468592439 -3600
# Node ID b25a7ec88e15df0b24b4b6f746fe22dfceb476c4
# Parent  48063d290d8725ec0212e0756c7f5c15f8c58cf8# Parent  e6c7585863feeba4d278c770314e3455e0020bdb
Merge

diff -r 48063d290d87 -r b25a7ec88e15 .hgsubstate
--- a/.hgsubstate	Thu Jul 14 17:14:30 2016 +0100
+++ b/.hgsubstate	Fri Jul 15 15:20:39 2016 +0100
@@ -2,7 +2,7 @@
 28f51eb8bf2dd985b0c1a6d704fb65e14c2f0f25 bqresample
 a518ddd9dd68917393887d28dfee6221bc37fb66 bqvec
 9f62684e1911c4184e7b97ba3a0673cb0464f3a2 checker
-d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
+2777e3578cf15fd0e579dc6ca9cdfe0d93d400f2 dataquay
 68ae618c6b0e442d08a71d39217784a08f2a8de3 icons/scalable
 1e4f338ae482429a7ab9bdd0825242042354152f sv-dependency-builds
 c3648c667a0bb9004c97f1997dca22b79c419e12 svapp