diff .hgsubstate @ 112:2169e7a448c5 bqvec-openmp

Merge from default branch
author Chris Cannam
date Wed, 07 May 2014 09:01:32 +0100
parents e236bf47ed51
children f7e3c782d758
line wrap: on
line diff
--- a/.hgsubstate	Wed May 07 08:55:44 2014 +0100
+++ b/.hgsubstate	Wed May 07 09:01:32 2014 +0100
@@ -1,1 +1,1 @@
-08f90c46ac6ba30d9e96517a20dba5be70b66d56 constant-q-cpp
+7d97986563a0b3104a5c3f88190350ae55528738 constant-q-cpp