summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2015-02-04 07:51:01 -0800
committerPatrick Ohly <patrick.ohly@intel.com>2015-02-04 07:51:01 -0800
commitd0c31526cd28cfd8bb7fe8d323672ac87fb4330f (patch)
treedcbbcbbe45a384ea252ba601b77950694000930d
parent0584a73fe042d1467a01668f165ff682c048199d (diff)
parent9c8697cba01ddc48b64e04c86bb90a6bd6c561d6 (diff)
downloadmeta-tizen-tizen-merged.tar.gz
meta-tizen-tizen-merged.tar.bz2
meta-tizen-tizen-merged.zip
Merge branch 'upstream' into tizen-mergedrev_ivi_2015_02_04_mergedtizen-merged
-rw-r--r--meta-tizen-common-base/recipes-application-framework/aul/aul_git.bb2
-rw-r--r--meta-tizen-common-base/recipes-core/tlm/tlm_git.bb2
-rw-r--r--meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty_git.bb2
-rw-r--r--meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk_git.bb2
-rw-r--r--meta-tizen-common-share/recipes-crosswalk/tizen-extensions-crosswalk/tizen-extensions-crosswalk.inc2
-rw-r--r--meta-tizen-common-share/recipes-crosswalk/tizen-extensions-crosswalk/tizen-extensions-crosswalk_git.bb2
-rw-r--r--meta-tizen-ivi/recipes-modello/Modello-Common/Modello-Common_git.bb2
7 files changed, 7 insertions, 7 deletions
diff --git a/meta-tizen-common-base/recipes-application-framework/aul/aul_git.bb b/meta-tizen-common-base/recipes-application-framework/aul/aul_git.bb
index f61fd086..2816749d 100644
--- a/meta-tizen-common-base/recipes-application-framework/aul/aul_git.bb
+++ b/meta-tizen-common-base/recipes-application-framework/aul/aul_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-SRC_URI += "git://review.tizen.org/platform/core/appfw/aul-1;tag=27c15aa6ef71fd37dd8cf5a3d10c8e29c82fcc34;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/appfw/aul-1;tag=ef7b405abf2577b9e5bf7aa24944e24552ca5b8e;nobranch=1"
BBCLASSEXTEND += " native "
diff --git a/meta-tizen-common-base/recipes-core/tlm/tlm_git.bb b/meta-tizen-common-base/recipes-core/tlm/tlm_git.bb
index 3344fc20..dfacf27f 100644
--- a/meta-tizen-common-base/recipes-core/tlm/tlm_git.bb
+++ b/meta-tizen-common-base/recipes-core/tlm/tlm_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-SRC_URI += "git://review.tizen.org/platform/core/system/tlm;tag=e341ea06e6b673d034258456e68966e7dfe2beb5;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/system/tlm;tag=8eb7b86257158f15bc29cd6f89487e72d2d0b67c;nobranch=1"
BBCLASSEXTEND += " native "
diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty_git.bb b/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty_git.bb
index 95146401..b3876965 100644
--- a/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty_git.bb
+++ b/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-SRC_URI += "git://review.tizen.org/platform/framework/web/crosswalk;tag=4b0df18728c2254b370c0c10f9a826b84b48e112;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/framework/web/crosswalk;tag=e337b1b2d330397537e67b4fc10b61430e9f0fd8;nobranch=1"
BBCLASSEXTEND += " native "
diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk_git.bb b/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk_git.bb
index eb3a3305..26c683cf 100644
--- a/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk_git.bb
+++ b/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-SRC_URI += "git://review.tizen.org/platform/framework/web/crosswalk;tag=4b0df18728c2254b370c0c10f9a826b84b48e112;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/framework/web/crosswalk;tag=e337b1b2d330397537e67b4fc10b61430e9f0fd8;nobranch=1"
BBCLASSEXTEND += " native "
diff --git a/meta-tizen-common-share/recipes-crosswalk/tizen-extensions-crosswalk/tizen-extensions-crosswalk.inc b/meta-tizen-common-share/recipes-crosswalk/tizen-extensions-crosswalk/tizen-extensions-crosswalk.inc
index 92e2bd91..6763469d 100644
--- a/meta-tizen-common-share/recipes-crosswalk/tizen-extensions-crosswalk/tizen-extensions-crosswalk.inc
+++ b/meta-tizen-common-share/recipes-crosswalk/tizen-extensions-crosswalk/tizen-extensions-crosswalk.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Tizen Web APIs implemented using Crosswalk"
HOMEPAGE = "http://nohomepage.org"
SECTION = "Development/Libraries"
LICENSE = "BSD-3-Clause and Apache-2.0"
-PV = "0.142"
+PV = "0.135"
SRC_URI = ""
diff --git a/meta-tizen-common-share/recipes-crosswalk/tizen-extensions-crosswalk/tizen-extensions-crosswalk_git.bb b/meta-tizen-common-share/recipes-crosswalk/tizen-extensions-crosswalk/tizen-extensions-crosswalk_git.bb
index 5dbb6031..09b55ed8 100644
--- a/meta-tizen-common-share/recipes-crosswalk/tizen-extensions-crosswalk/tizen-extensions-crosswalk_git.bb
+++ b/meta-tizen-common-share/recipes-crosswalk/tizen-extensions-crosswalk/tizen-extensions-crosswalk_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-SRC_URI += "git://review.tizen.org/platform/framework/web/tizen-extensions-crosswalk;tag=298ad18b6a9650c3f3f00d0c32b8912a7336743a;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/framework/web/tizen-extensions-crosswalk;tag=51df5ec72a79879045ec346c31efd79470c8ea98;nobranch=1"
BBCLASSEXTEND += " native "
diff --git a/meta-tizen-ivi/recipes-modello/Modello-Common/Modello-Common_git.bb b/meta-tizen-ivi/recipes-modello/Modello-Common/Modello-Common_git.bb
index 68db5e7c..3d682e17 100644
--- a/meta-tizen-ivi/recipes-modello/Modello-Common/Modello-Common_git.bb
+++ b/meta-tizen-ivi/recipes-modello/Modello-Common/Modello-Common_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Common;tag=2122fc8fa13e81743131a236ae51b5890c9de289;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Common;tag=a8ad462a53912916a388f2915bc1f270dffe3426;nobranch=1"
BBCLASSEXTEND += " native "