# HG changeset patch
# User Chris Cannam
# Date 1569415666 -3600
# Node ID 71e97de5053f27c421aba25e518965508006406b
# Parent  7fc6256af2d28e896a03be6a9426a1089337b1f2# Parent  f0ffc88a36b3a8d020808e1fa6997ad47e49746b
Merge from branch time-frequency-boxes