Fix ico-uxf-homescreen/murphy conflict 45/29045/1
authorRonan Le Martret <ronan@fridu.net>
Mon, 20 Oct 2014 13:53:51 +0000 (15:53 +0200)
committerRonan Le Martret <ronan@fridu.net>
Mon, 20 Oct 2014 13:53:51 +0000 (15:53 +0200)
commita1d312bc2338766dcb56b76f7c49e6c2da0df35a
treeff4d23f94962e476912f0a593661d338d675ca43
parent8808e5647de1503d0b39b00b07aabb443b38e062
Fix ico-uxf-homescreen/murphy conflict

Change-Id: I36ab2e9239fe683b39fa097a0db8b83cc5633a5a
Signed-off-by: Ronan Le Martret <ronan@fridu.net>
conf/layer.conf
recipes-image/images/tizen-ivi-ico-image.bb
recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen-extraconf.inc
recipes-tizen/murphy/murphy-extraconf.inc