diff .hgsubstate @ 231:d9b688700819 norm eval-norm-todate

Merge from default branch
author Chris Cannam
date Wed, 16 Jul 2014 17:46:15 +0100
parents f4fda33c3b3b
children 8aa810eeff40
line wrap: on
line diff
--- a/.hgsubstate	Tue Jul 15 13:32:27 2014 +0100
+++ b/.hgsubstate	Wed Jul 16 17:46:15 2014 +0100
@@ -1,2 +1,2 @@
 a2621605a8c2119bb063c59e83f4fe792a58e4ac bqvec
-c7d17fcd215cd2ab66b66c5b89651932cd22d355 constant-q-cpp
+e6b00b4788bedadb1ca855ea4f67a765fbe52034 constant-q-cpp