From 124572f79749df23cab3e08f91b3e8578fc665ab Mon Sep 17 00:00:00 2001
From: Daniel Silverstone <daniel.silverstone@codethink.co.uk>
Date: Wed, 1 Oct 2014 14:06:56 +0000
Subject: More updates for SDL HMI

Conflicts:
	strata/genivi-smartdevicelink.morph
	systems/genivi-plusplus-system-armv7lhf-jetson.morph
---
 strata/genivi-smartdevicelink.morph | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'strata/genivi-smartdevicelink.morph')

diff --git a/strata/genivi-smartdevicelink.morph b/strata/genivi-smartdevicelink.morph
index ea477f34..e20f574f 100644
--- a/strata/genivi-smartdevicelink.morph
+++ b/strata/genivi-smartdevicelink.morph
@@ -5,7 +5,8 @@ build-depends:
 - morph: strata/genivi-foundation.morph
 - morph: strata/genivi.morph
 - morph: strata/audio-bluetooth.morph
-- morph: strata/qt5-tools-jetson.morph
+- morph: strata/multimedia.morph
+- morph: strata/qt5-tools-new.morph
 chunks:
 - name: libapr-tarball
   repo: upstream:libapr-tarball
-- 
cgit v1.2.1