# HG changeset patch
# User Chris Cannam
# Date 1569415782 -3600
# Node ID a2162fd2e8eb8e685d5bad7fb8c282a6f716b1cf
# Parent  61295186a887c65f4536a9189789f63714502b95# Parent  2721030c939fcce21b5977b0cf9f3424501330bf
Merge from branch time-frequency-boxes