summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Brewer <benbrewer@codethink.co.uk>2012-11-22 09:11:21 +0000
committerBen Brewer <benbrewer@codethink.co.uk>2012-11-22 09:11:21 +0000
commit27ecfe0dc0cb56bb6123d299ca74168e2767a80d (patch)
treeb793263f47df3911e61e2c1ae8c30028e05ac513
parent636d109e79cbd18b81cf5941861734ffc615ed83 (diff)
downloadmorphs-27ecfe0dc0cb56bb6123d299ca74168e2767a80d.tar.gz
Merged x-wayland-split tree
-rw-r--r--wayland.morph6
-rw-r--r--x.morph4
2 files changed, 5 insertions, 5 deletions
diff --git a/wayland.morph b/wayland.morph
index 27a0e17..aaf6c6b 100644
--- a/wayland.morph
+++ b/wayland.morph
@@ -29,11 +29,11 @@
]
},
{
- "name": "mesa",
+ "name": "mesa-wayland",
"repo": "upstream:mesa",
- "ref": "ct/genivi/wayland",
+ "ref": "ct/genivi/morph",
"build-depends": [
- "wayland",
+ "wayland"
]
}
]
diff --git a/x.morph b/x.morph
index a4a7bb4..556b8c2 100644
--- a/x.morph
+++ b/x.morph
@@ -15,9 +15,9 @@
],
"chunks": [
{
- "name": "mesa",
+ "name": "mesa-x",
"repo": "upstream:mesa",
- "ref": "ct/genivi/wayland",
+ "ref": "ct/genivi/morph",
"build-depends": []
},
{