diff options
author | Javier Jardón <jjardon@gnome.org> | 2015-02-20 15:54:27 +0000 |
---|---|---|
committer | Javier Jardón <jjardon@gnome.org> | 2015-02-20 15:54:52 +0000 |
commit | 96168a6614a567928dd2f244998a9ad3e8f29359 (patch) | |
tree | 721478e017a707e81e8894b63e3a9fc7b786ad26 /systems/gitlab-ci-runner.morph | |
parent | ef71b54fd294613f230697a2f74d39e507d03b23 (diff) | |
parent | b6461f046ff67295ce3aaea38689800aea7570a7 (diff) | |
download | definitions-96168a6614a567928dd2f244998a9ad3e8f29359.tar.gz |
Merge branch 'baserock/jjardon/multimedia'
Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk>
Reviewed-by: James Thomas <james.thomas@codethink.co.uk>
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 |