From 57382b29179583ea79a60e8ecb722b1f53f2ecec Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Tue, 31 Dec 2013 02:20:23 -0800 Subject: [PATCH 1/7] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/8c281b3688f7 Author: Amir Nissim Desc: Merge pull request #14974 from EverythingMe/947152-eme-logs Bug 947152 - [evme] Do not print debug message by default [r=ranbena, crdlc] ======== https://hg.mozilla.org/integration/gaia-central/rev/e4589b07e722 Author: Amir Nissim Desc: Bug 947152 - [evme] Do not print debug message by default [r=ranbena, crdlc] --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 7a38088dde88..94b3855bd89b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "c74107624e0e8900fd7942024758b44a1cb6de4c", + "revision": "8c281b3688f7ceee25daa96162a3fe0f8dcce783", "repo_path": "/integration/gaia-central" } From ebe054bef2526eda0048500d4a67edaf975e6e15 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Tue, 31 Dec 2013 03:50:22 -0800 Subject: [PATCH 2/7] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/2a18abf97ef4 Author: Amir Nissim Desc: Merge pull request #14969 from EverythingMe/950857-rename-to-smart-collections Bug 950857 - Rename 'Collections' to 'Smart Collections' [r=ranbena] ======== https://hg.mozilla.org/integration/gaia-central/rev/c883735df66c Author: Amir Nissim Desc: Bug 950857 - Rename 'Collections' to 'Smart Collections' [r=ranbena] --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 94b3855bd89b..d46988dfc0b6 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "8c281b3688f7ceee25daa96162a3fe0f8dcce783", + "revision": "2a18abf97ef44d9479c734da251034f66a658eb3", "repo_path": "/integration/gaia-central" } From 84e5a5fae8c49852cd7f0ad72360cd09991065d7 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Tue, 31 Dec 2013 05:30:22 -0800 Subject: [PATCH 3/7] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/e484a6650414 Author: Fabien Cazenave Desc: Merge pull request #14963 from TheoChevalier/Bug953063-fdn-edit Bug 953063 - [Settings][l12y] fdnAction-edit used on contextual menu and header, r=kaze ======== https://hg.mozilla.org/integration/gaia-central/rev/575dd0b5bdb2 Author: TheoChevalier Desc: Bug 953063 - [Settings][l12y] fdnAction-edit used on contextual menu and header --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index d46988dfc0b6..b0710816e7ad 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "2a18abf97ef44d9479c734da251034f66a658eb3", + "revision": "e484a6650414af8cf68614cc7366369fce0afb84", "repo_path": "/integration/gaia-central" } From 6f57e67a580e4d3ae2b732865c67514be7c9d03e Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 1 Jan 2014 13:15:23 -0800 Subject: [PATCH 4/7] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/892e7b12856e Author: Diego Marcos Desc: Merge pull request #13363 from dmarcos/bug934657 Bug 934657 - [Camera] Restructuring code following model / view pattern ======== https://hg.mozilla.org/integration/gaia-central/rev/2bca8bc96cdb Author: Justin D'Arcangelo Desc: Bug 934657 - [Camera] Restructuring code following model / view pattern --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index b0710816e7ad..b8300510fd11 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "e484a6650414af8cf68614cc7366369fce0afb84", + "revision": "892e7b12856eb999f0ac3830c248fffeb90640d9", "repo_path": "/integration/gaia-central" } From d455e5efa372e21e6f73504f48ba24906b08760b Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 1 Jan 2014 15:00:23 -0800 Subject: [PATCH 5/7] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/311adb0a5834 Author: James Lal Desc: Merge pull request #14980 from lightsofapollo/revert-c38d3842daa97cea360fce1af82f2d7b78134bc3 Revert "Merge pull request #13363 from dmarcos/bug934657" ======== https://hg.mozilla.org/integration/gaia-central/rev/287d929a42ca Author: James Lal Desc: Revert "Merge pull request #13363 from dmarcos/bug934657" This reverts commit c38d3842daa97cea360fce1af82f2d7b78134bc3, reversing changes made to 5de94a2be6ab8d33434294d70c1de330f55d8f2d. --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index b8300510fd11..5cf1d09fc991 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "892e7b12856eb999f0ac3830c248fffeb90640d9", + "revision": "311adb0a583430a4e445176fdedf337bce2e1788", "repo_path": "/integration/gaia-central" } From 214595170b3444965912c7afdb3eb68a01ee4d98 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 1 Jan 2014 18:30:22 -0800 Subject: [PATCH 6/7] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/8c8d0a8bc239 Author: George Desc: Merge pull request #14941 from cctuan/953007 Bug 953007 - [Gaia] [Build] Error when make install-gaia APP=uitest ======== https://hg.mozilla.org/integration/gaia-central/rev/eb791416f8cd Author: cctuan Desc: Bug 953007 - [Gaia] [Build] Error when make install-gaia APP=uitest --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 5cf1d09fc991..7131dc1a22a1 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "311adb0a583430a4e445176fdedf337bce2e1788", + "revision": "8c8d0a8bc239e6b230676dde045a31b9318c2481", "repo_path": "/integration/gaia-central" } From bc476c20495cb7fd92be8285317a159c22c06174 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 1 Jan 2014 19:30:22 -0800 Subject: [PATCH 7/7] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/77a90d19d2c6 Author: gasolin Desc: Merge pull request #14966 from kumarrishav/issue-944289 Bug 944289 [UITEST] add Compose Email activity, r=gasolin ======== https://hg.mozilla.org/integration/gaia-central/rev/2bd75dd1c8be Author: kumarrishav Desc: Bug 944289 [UITEST] add Compose Email activity - bug fixed --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 7131dc1a22a1..2391b6498cec 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "8c8d0a8bc239e6b230676dde045a31b9318c2481", + "revision": "77a90d19d2c6feb621f894685068bd131c0a0fdb", "repo_path": "/integration/gaia-central" }