# HG changeset patch # User Chris Cannam # Date 1446554475 0 # Node ID 99acfd2d9f5dea40e94b6a4f2a1050acffde9222 # Parent c7f1300dbf64bcd7ba790ad36b2b53bbb3f84123# Parent 6d550a16f7d69410eafe759fee2d3e7d0aefca7b Merge diff -r c7f1300dbf64 -r 99acfd2d9f5d data/model/test/MockWaveModel.cpp --- a/data/model/test/MockWaveModel.cpp Tue Nov 03 11:34:44 2015 +0000 +++ b/data/model/test/MockWaveModel.cpp Tue Nov 03 12:41:15 2015 +0000 @@ -15,6 +15,8 @@ #include "MockWaveModel.h" +#include + using namespace std; MockWaveModel::MockWaveModel(vector sorts, int length, int pad)