From cd3d5aed4d278dc6c8cbf5ec4e26fe319d2bfd5c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Fri, 15 May 2015 15:00:27 -0700 Subject: [PATCH] Bumping gaia.json for 5 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/3c3c14658d6d Author: Gareth Aye Desc: Merge pull request #30069 from gaye/bug-1164684-jsmarionette-in-gaia Bug 1164684 - Move the jsmarionette code tree into test/jsmarionette ======== https://hg.mozilla.org/integration/gaia-central/rev/045704bb8885 Author: gaye Desc: Bug 1164684 - Move the jsmarionette code tree into test/jsmarionette ======== https://hg.mozilla.org/integration/gaia-central/rev/490b3ff8d45d Author: gaye Desc: Bug 1164987 - Add jsmarionette component dependencies ======== https://hg.mozilla.org/integration/gaia-central/rev/22fbdb571a10 Author: autolander Desc: Bug 1164796 - merge pull request #30064 from KevinGrandon:bug_1164796_migrate_video_tagged to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/93a76b896c6e Author: Kevin Grandon Desc: Bug 1164796 - [Video] Migrate to tagged template strings r=russn --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 6b4c6d76c3cc..a4ab11994b01 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "417c41adc2c29b845bcfd1bdae8543a622090256", + "git_revision": "7607d06426aa5855d042e81f53bd3c14af825b18", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "b55ed28fe172af622258559f0a18bc4765c47074", + "revision": "3c3c14658d6d788190888d89f39c376afc762d6c", "repo_path": "integration/gaia-central" }