diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-02-20 16:16:06 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-02-20 16:16:06 +0000 |
commit | 429a4600c9c7755ab3a3338df820a586930eee67 (patch) | |
tree | 3e4f0430d59c527573b89e07735ce8081354f713 /systems/gitlab-ci-runner.morph | |
parent | 2c3baf2c61da8b7eb286bbc9de862a5d68af189b (diff) | |
parent | 96168a6614a567928dd2f244998a9ad3e8f29359 (diff) | |
download | infrastructure-429a4600c9c7755ab3a3338df820a586930eee67.tar.gz |
Merge remote-tracking branch 'baserock/master'
Diffstat (limited to 'systems/gitlab-ci-runner.morph')
-rw-r--r-- | systems/gitlab-ci-runner.morph | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph index b4e20ec7..979b73b0 100644 --- a/systems/gitlab-ci-runner.morph +++ b/systems/gitlab-ci-runner.morph @@ -21,8 +21,10 @@ strata: morph: strata/x-common.morph - name: x-generic morph: strata/x-generic.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph - name: genivi morph: strata/genivi.morph - name: tools |