Merge branch 'master' of https://gitrepos.estec.esa.int/taste/taste-setup

fd17cba4 · Thanassis Tsiodras · a8756343 · c6d0fb3d · b8325b93 · f911ee85
Commit fd17cba4 authored Oct 22, 2017 by Thanassis Tsiodras
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

buildsupport buildsupport +1 -1

ocarina ocarina +1 -1

No files found.
--- a/buildsupport @ b8325b93
+++ b/buildsupport @ b8325b93
-Subproject commit f911ee85d85fb71c8c83bff2d9635e1aaa05db57
+Subproject commit b8325b933e8bcae2a6bbc63ffcca8887bc78c164
--- a/ocarina @ d078c548
+++ b/ocarina @ d078c548
-Subproject commit 3b2c7442de697fa20be8a4e60be067369d4b70a9
+Subproject commit d078c548df711a785e045011574249f1d49905ef