# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1518104487 0
# Node ID 3994516c1199ee1c2bffaedc11cc22dd7a8707b8
# Parent  624ddb622a5d76d16f30b47fc00b7ce75e32da93# Parent  236fcb53cfa9bde4f268228fa45efed2bbe29573
Merge from branch msvc