# HG changeset patch
# User Chris Cannam
# Date 1544003050 0
# Node ID 88fa1544b4077865c42633a422aaff2e734ef260
# Parent  88061103b878d5f2a9b7bb57a5029087c812e2ce# Parent  ce29dc7756508b4c7c2eb40dec00ceeeb4ac2822
Merge from branch qt5. There's much more to be done before we can make another release, but clearly it's going to be done using qt5