Merge branch 'master' of i10git.cs.fau.de:er96apow/UGBlocks_V3

06fdebff · Phillip Lino Rall · f3b1d4a9 · 04bf37a7 · 06fdebff · 06fdebff
Commit 06fdebff authored Sep 02, 2020 by Phillip Lino Rall
--- a/program/source/interpol/interpol.cc
+++ b/program/source/interpol/interpol.cc
@@ -34,7 +34,7 @@
 #include "../extemp/co_fu.h"
 #include "../extemp/functor.h"
 #include "interpol.h"
-#include "customtime.h"
+//#include "customtime.h"
 #include <iomanip>
 #include "assert.h"


--- a/program2D/program.pro
+++ b/program2D/program.pro
@@ -3,7 +3,7 @@
 ######################################################################

 # getting pathes:
-include(../config.pri)
+include(../configMy.pri)

 # GPU support
 #CUDA_BASE = /usr/local