From a9fdc3f87528d043edad580909ce596c8464b960 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 6 Apr 2014 21:26:04 -0700 Subject: [PATCH] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/db1df4debc98 Author: Yuren Ju Desc: Merge pull request #18008 from yurenju/stage5 Bug 897352 - [gaia build system] Transition to a build_stage for assembl... ======== https://hg.mozilla.org/integration/gaia-central/rev/ba892a76e1dd Author: Yuren Ju Desc: Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps Conflicts: Makefile apps/communications/build/build.js build/copy-build-stage-manifest.js build/test/integration/distribution.test.js build/utils-xpc.js build/utils.js build/webapp-manifests.js --- 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 2865aa6dc27..18053bfe3ae 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "f8d94a375c284c3c2c7d1aa272016bcc15eb6b9b", + "revision": "db1df4debc981e793b594d0b78fef6d4dd3ac9c2", "repo_path": "/integration/gaia-central" }