review.tizen.org Git - scm/bb/meta-tizen.git/commit

projects / scm / bb / meta-tizen.git / commit

author	Patrick Ohly <patrick.ohly@intel.com>
	Mon, 26 Jan 2015 11:20:16 +0000 (03:20 -0800)
committer	Patrick Ohly <patrick.ohly@intel.com>
	Mon, 26 Jan 2015 11:20:16 +0000 (03:20 -0800)
commit	fddf98b8f25efabd2b9b4ae85a77f686671bb160
tree	aa727aa938aae29e5f8feea220de7b543eda7b4e	tree \| snapshot
parent	5f0b446f5ad2b8a625eeb956eec673f3f0b0ab4d	commit \| diff
parent	a2ba175eaefa7c52380f6f34eef70db9d45817e7	commit \| diff

Merge branch 'upstream' into master_merged

Conflicts:
meta-tizen-common-base/recipes-application-framework/app-svc/app-svc.inc
meta-tizen-common-base/recipes-multimedia/libmm-common/libmm-common.inc
meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk.inc
meta-tizen-ivi/recipes-graphics/genivi-shell/genivi-shell.inc
meta-tizen-ivi/recipes-ico/ico-vic-amb-plugin/ico-vic-amb-plugin.inc

   All caused by the -j16 change.

meta-tizen-common-base/recipes-application-framework/pkgmgr/pkgmgr_git.bb

   Source was manually changed. Now uses the IVI revision.

meta-tizen-common-base/recipes-multimedia/pulseaudio/pulseaudio.inc
meta-tizen-common-share/recipes-connectivity/ofono/ofono.inc

   Caused by manually fixing the Bluez4 dependency. Manual fix no longer
   necessary.

Change-Id: I5c8d814fb87cd06cc72ca6253d625c8c9c4f5f60

31 files changed:

meta-tizen-common-base/recipes-application-framework/ail/ail.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-application-framework/app-svc/app-svc.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-application-framework/pkgmgr/pkgmgr.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-connectivity/download-provider/download-provider.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-core/tizen-platform-config/tizen-platform-config.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-devtools/gobject-introspection/gobject-introspection.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-devtools/tdb/tdb.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-devtools/vala/vala.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-framework/notification/notification_git.bb	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-graphics/libtbm/libtbm.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-graphics/libtbm/libtbm_git.bb	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-graphics/weston/weston.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-multimedia/libmedia-thumbnail/libmedia-thumbnail.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-multimedia/libmm-common/libmm-common.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-multimedia/libmm-sound/libmm-sound.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-multimedia/media-server/media-server.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-multimedia/pulseaudio/pulseaudio.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-multimedia/tiff/tiff.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-security/gsignond/gsignond.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-security/libsecret/libsecret.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-security/smack/smack.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-share/recipes-connectivity/ofono/ofono.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-share/recipes-crosswalk/tizen-extensions-crosswalk/tizen-extensions-crosswalk.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-ivi/recipes-extended/automotive-message-broker/automotive-message-broker.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-ivi/recipes-graphics/genivi-shell/genivi-shell.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-ivi/recipes-graphics/weston-ivi-shell/weston-ivi-shell.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-ivi/recipes-ico/ico-uxf-homescreen/ico-uxf-homescreen.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-ivi/recipes-ico/ico-uxf-weston-plugin/ico-uxf-weston-plugin.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-ivi/recipes-ico/ico-vic-amb-plugin/ico-vic-amb-plugin.inc	diff1 \|	diff2 \|	blob \| history

Domain: SCM / BB;

RSS Atom

meta-tizen-common-base/recipes-application-framework/ail/ail.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-application-framework/app-svc/app-svc.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-application-framework/pkgmgr/pkgmgr.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-connectivity/download-provider/download-provider.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-core/tizen-platform-config/tizen-platform-config.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-devtools/gobject-introspection/gobject-introspection.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-devtools/tdb/tdb.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-devtools/vala/vala.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-framework/notification/notification_git.bb	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-graphics/libtbm/libtbm.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-graphics/libtbm/libtbm_git.bb	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-graphics/weston/weston.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-multimedia/libmedia-thumbnail/libmedia-thumbnail.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-multimedia/libmm-common/libmm-common.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-multimedia/libmm-sound/libmm-sound.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-multimedia/media-server/media-server.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-multimedia/pulseaudio/pulseaudio.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-multimedia/tiff/tiff.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-security/gsignond/gsignond.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-security/libsecret/libsecret.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-base/recipes-security/smack/smack.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-share/recipes-connectivity/ofono/ofono.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-common-share/recipes-crosswalk/tizen-extensions-crosswalk/tizen-extensions-crosswalk.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-ivi/recipes-extended/automotive-message-broker/automotive-message-broker.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-ivi/recipes-graphics/genivi-shell/genivi-shell.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-ivi/recipes-graphics/weston-ivi-shell/weston-ivi-shell.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-ivi/recipes-ico/ico-uxf-homescreen/ico-uxf-homescreen.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-ivi/recipes-ico/ico-uxf-weston-plugin/ico-uxf-weston-plugin.inc	diff1 \|	diff2 \|	blob \| history
meta-tizen-ivi/recipes-ico/ico-vic-amb-plugin/ico-vic-amb-plugin.inc	diff1 \|	diff2 \|	blob \| history