Merge remote-tracking branch 'origin/develop' into develop-pre-release

This commit is contained in:
mattijs
2018-05-29 12:13:58 +01:00
23 changed files with 369 additions and 432 deletions

View File

@ -52,6 +52,6 @@ maxAlphaCo 1;
maxDeltaT 1;
#includeIfPresent "sampling"
#sinclude "sampling"
// ************************************************************************* //