# HG changeset patch
# User Chris Cannam
# Date 1368531365 -3600
# Node ID 67003fb58ba4d69022a4af9339e54bb60158683a
# Parent  fea591a66e5d562706880f163903e46dfa42fad2# Parent  d8ec22ef0da87c44129621fd974a1bbcfea2b2f0
Merge from branch "qt5". This revision actually builds with Qt4 (late releases) or Qt5, though it will warn on configure with Qt4.