CMakeLists.txt · 6ee4cbe5da624e388828eaa9b212eed48c02a8c0 · solverstack / ScalFMM

Mar 10, 2017

Merge remote-tracking branch 'origin/master' into simgrid · 7863df56

Luka Stanisic authored Mar 10, 2017

# Conflicts:
#	CMakeLists.txt
#	Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp
#	Src/GroupTree/StarPUUtils/FStarPUTaskNameParams.hpp
#	Tests/GroupTree/testBlockedUniform.cpp

7863df56

Merge remote-tracking branch 'origin/master' into simgrid

Luka Stanisic authored Mar 10, 2017

# Conflicts:
#	CMakeLists.txt
#	Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp
#	Src/GroupTree/StarPUUtils/FStarPUTaskNameParams.hpp
#	Tests/GroupTree/testBlockedUniform.cpp

Admin message