# HG changeset patch # User Chris Cannam # Date 1541502778 0 # Node ID f6e7d0e783e8a1021fa7fec8fa7bfd6b70c753b9 # Parent 175ef02c7864d91a22f8458d1c0ac922d2314682# Parent 2a06e4bc1c41a079052798acdd3f0a92d87d0e43 Merge from branch zoom diff -r 175ef02c7864 -r f6e7d0e783e8 data/model/RangeSummarisableTimeValueModel.h --- a/data/model/RangeSummarisableTimeValueModel.h Fri Nov 02 14:41:00 2018 +0000 +++ b/data/model/RangeSummarisableTimeValueModel.h Tue Nov 06 11:12:58 2018 +0000 @@ -19,7 +19,6 @@ #include #include "DenseTimeValueModel.h" -#include "base/ZoomConstraint.h" #include