diff .hgsubstate @ 267:a8c05709e486

Merge from branch "norm"
author Chris Cannam
date Wed, 23 Jul 2014 17:51:58 +0100
parents 1d5258a37cdd
children 62b92d9b566a
line wrap: on
line diff
--- a/.hgsubstate	Tue Jul 22 18:32:00 2014 +0100
+++ b/.hgsubstate	Wed Jul 23 17:51:58 2014 +0100
@@ -1,2 +1,3 @@
 a2621605a8c2119bb063c59e83f4fe792a58e4ac bqvec
 e6b00b4788bedadb1ca855ea4f67a765fbe52034 constant-q-cpp
+ca4e31d8643619e2f8b4486dffa5d118650f6ff2 flattendynamics