From 4aa9d9e5d0c00a3209fb09a335652322b8745a39 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 31 Mar 2015 01:05:26 -0700 Subject: [PATCH] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/e6ba79372887 Author: autolander Desc: Bug 1146804 - merge pull request #29087 from mnjul:bug_1146804_xml2dict_js to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/77c68197d728 Author: John Lu [:mnjul] Desc: Bug 1146804 - Create file front-end for word_list_converter.js xml2dict.js can now perform the function of xml2dict.py. It requires node.js (as does Gaia build environment), and xml2js npm package. Makefile has been modified accordingly and would target the xml2js dependency as a phony. ======== https://hg.mozilla.org/integration/gaia-central/rev/6a7b28fe3417 Author: autolander Desc: Bug 994357 - merge pull request #29243 from stasm:994357-reland to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/e987d3661dee Author: Staś Małolepszy Desc: Bug 994357 - Use DOM overlays for safely setting node content. r=gandalf --- 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 102facad29b6..2b9cb27df59f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "36b6f9f824782457ae0674382604cb69d915dee4", + "git_revision": "d08600b883589cfb556a7a3f39310b6b4e8106a0", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "6dfd7dd6e52ed167d48c82d4f37fd96e4c75b0e2", + "revision": "e6ba793728875f04612bf287e03b4ec9a1614e59", "repo_path": "integration/gaia-central" }