# HG changeset patch
# User Chris Cannam
# Date 1569415684 -3600
# Node ID d5ef91dc2ea71cd79a81648742c8441d4955122b
# Parent  872873aa64632ac5c484e490b1b72736821b10f5# Parent  d3ef60b6ae93f069252cd854d904893ad3f6b72e
Merge from branch time-frequency-boxes