From 27ecfe0dc0cb56bb6123d299ca74168e2767a80d Mon Sep 17 00:00:00 2001
From: Ben Brewer <benbrewer@codethink.co.uk>
Date: Thu, 22 Nov 2012 09:11:21 +0000
Subject: Merged x-wayland-split tree

---
 wayland.morph | 6 +++---
 x.morph       | 4 ++--
 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": []
         },
         {
-- 
cgit v1.2.1