diff .hgsubstate @ 115:95de6db296a1

Merge from multiplex branch
author Chris Cannam
date Fri, 03 Oct 2014 15:07:19 +0100
parents 34a0dad473c3
children 1c0799754670
line wrap: on
line diff
--- a/.hgsubstate	Thu Oct 02 15:21:16 2014 +0100
+++ b/.hgsubstate	Fri Oct 03 15:07:19 2014 +0100
@@ -1,2 +1,2 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
-58c4d69b4dd8ff05908097ea2d5c520067b12aa4 svcore
+c9d456b1fcde4ddc6e0347c4eb105a8b6e4ca527 svcore