diff .hgsubstate @ 314:f98ba4f47e49 livemode

Merge from default branch
author Chris Cannam
date Tue, 28 Apr 2015 11:24:23 +0100
parents 26be240475b5 fa2ffbb786df
children 92293058368a
line wrap: on
line diff
--- a/.hgsubstate	Mon Jan 19 09:33:35 2015 +0000
+++ b/.hgsubstate	Tue Apr 28 11:24:23 2015 +0100
@@ -1,3 +1,3 @@
-352579430f81c79a550741a97bb1f96fea05da75 bqvec
-4aa3d343f5fcc21c821c0f2f633980da2d8fc8bd constant-q-cpp
+7a48704e9a0fac1486240f9f7b7e31436a588064 bqvec
+4d109d855c671c514dbc4947b0dae7cada112d8c constant-q-cpp
 d25a2e91e9d84aaff25e5d746398232d182d127d flattendynamics