Commit 06fdebff authored by Phillip Lino Rall's avatar Phillip Lino Rall
Browse files

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

parents f3b1d4a9 04bf37a7
......@@ -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"
......
......@@ -3,7 +3,7 @@
######################################################################
# getting pathes:
include(../config.pri)
include(../configMy.pri)
# GPU support
#CUDA_BASE = /usr/local
......
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