# HG changeset patch
# User Chris Cannam
# Date 1435324045 -3600
# Node ID a27b1ce86e4f2083904b5dc113adf5d9f7b40c1b
# Parent  5fab8e4f5f19515cd3b9c6b4650df0e5f8d2fabb# Parent  393134235fa0f1aa9cd4d1fc68a732030296365e
Merge from branch simple-fft-model