diff options
| author | Javier Jardón <jjardon@gnome.org> | 2015-02-03 10:18:45 +0000 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2015-02-03 10:19:27 +0000 |
| commit | b95bcaf8589717728a5b32227c55941334b1d46a (patch) | |
| tree | 5fba6132a242e8dcd77f2a028739eba819173135 /systems/weston-system-x86_64-generic.morph | |
| parent | abef72d698a0ed48580cbedef5d8e1be058f906f (diff) | |
| parent | e37a3e0133c7ab8f55c0438f6e8264ba1294072f (diff) | |
| download | definitions-b95bcaf8589717728a5b32227c55941334b1d46a.tar.gz | |
Merge branch 'baserock/jjardon/xwayland'
Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk>
Reviewed-by: Richard Maw <richard.maw@codethink.co.uk>
Diffstat (limited to 'systems/weston-system-x86_64-generic.morph')
| -rw-r--r-- | systems/weston-system-x86_64-generic.morph | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph index 491a34bc..b84eaeb5 100644 --- a/systems/weston-system-x86_64-generic.morph +++ b/systems/weston-system-x86_64-generic.morph @@ -33,6 +33,10 @@ strata: morph: strata/mesa-common.morph - name: weston-common morph: strata/weston-common.morph +- name: x-common + morph: strata/x-common.morph +- name: x-generic + morph: strata/x-generic.morph configuration-extensions: - set-hostname - add-config-files |