# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1474636990 -3600
# Node ID d0ab0cdc787c3abaf1cd9e98c979d93ca3e213de
# Parent  d3471fff41ce27347b7fb50f7c78fdedd5a54276# Parent  233327e4956f96506310670b48fcb87f4d2354f6
Merge from noexcept branch