summaryrefslogtreecommitdiff
path: root/systems/xfce-system.morph
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-02-20 15:54:27 +0000
committerJavier Jardón <jjardon@gnome.org>2015-02-20 15:54:52 +0000
commit96168a6614a567928dd2f244998a9ad3e8f29359 (patch)
tree721478e017a707e81e8894b63e3a9fc7b786ad26 /systems/xfce-system.morph
parentef71b54fd294613f230697a2f74d39e507d03b23 (diff)
parentb6461f046ff67295ce3aaea38689800aea7570a7 (diff)
downloaddefinitions-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/xfce-system.morph')
-rw-r--r--systems/xfce-system.morph6
1 files changed, 4 insertions, 2 deletions
diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph
index 697ea52d..5aea4f7b 100644
--- a/systems/xfce-system.morph
+++ b/systems/xfce-system.morph
@@ -23,8 +23,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: gtk2