linux compat

parent e3a1d229
...@@ -5,12 +5,8 @@ ...@@ -5,12 +5,8 @@
#include <ITANetAudioServer.h> #include <ITANetAudioServer.h>
#include <ITAStreamFunctionGenerator.h> #include <ITAStreamFunctionGenerator.h>
#include <ITAStreamMultiplier1N.h> #include <ITAStreamMultiplier1N.h>
<<<<<<< HEAD
#include <ITAFileDataSource.h> #include <ITAFileDataSource.h>
======= #include <VistaBase/VistaTimeUtils.h>
#include <ITAFileDatasource.h>
#include <VistaBase\VistaTimeUtils.h>
>>>>>>> 8eb8596629ad0642aaaec5a68bf1554216289863
using namespace std; using namespace std;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment