Merge branch 'devel' of git.vannes:/srv/git/gitcache/review.tizen.org//scm/bb/meta...
authorRonan Le Martret <ronan@fridu.net>
Wed, 25 Jun 2014 18:07:30 +0000 (20:07 +0200)
committerRonan Le Martret <ronan@fridu.net>
Wed, 25 Jun 2014 18:07:30 +0000 (20:07 +0200)
commit6a4a5ff7de6f853743725f227e185cc371789df0
tree04778e411f252a5d6b3b23110eaae5ee42785600
parent32a821c43312a735382c8a3cac07ce7ed50220dc
parent8d29cef4325d3f19bd86954f6666d0c015ad4981
Merge branch 'devel' of git.vannes:/srv/git/gitcache/review.tizen.org//scm/bb/meta-tizen into devel

Conflicts:
recipes-connectivity/bluez/bluez4_4.101.bbappend
recipes-tizen/libmm-fileinfo/libmm-fileinfo-extraconf.inc
recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc
recipes-tizen/libmm-utility/libmm-utility.inc
recipes-tizen/tizen-extensions-crosswalk/tizen-extensions-crosswalk.inc

Change-Id: I8f4efc85d5fc255b7310f9eca0a0951fd1275ea8
recipes-tizen/libmm-fileinfo/libmm-fileinfo-extraconf.inc
recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc
recipes-tizen/libmm-utility/libmm-utility.inc