Mercurial > hg > silvet
comparison src/EM.cpp @ 314:f98ba4f47e49 livemode
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 28 Apr 2015 11:24:23 +0100 |
parents | 26be240475b5 37d2d04d94db |
children | 8a2166088b94 |
comparison
equal
deleted
inserted
replaced
308:26be240475b5 | 314:f98ba4f47e49 |
---|---|
20 | 20 |
21 #include <iostream> | 21 #include <iostream> |
22 | 22 |
23 #include "bqvec/VectorOps.h" | 23 #include "bqvec/VectorOps.h" |
24 #include "bqvec/Allocators.h" | 24 #include "bqvec/Allocators.h" |
25 | |
26 #include "Instruments.h" | 25 #include "Instruments.h" |
27 | 26 |
28 using std::vector; | 27 using std::vector; |
29 using std::cerr; | 28 using std::cerr; |
30 using std::endl; | 29 using std::endl; |