# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1524840530 -3600
# Node ID 23b2a2f93c5a44701c4b621be85979dcd4fd8ef2
# Parent  8dca49290db9d54ebfac0c7b784f03e646942e0b# Parent  90c943d7994311089cf2fed5d632a19a79a4d28f
Merge from branch MSVC