From deede29ffd1493bff89dbca7963a3549f7ae9f63 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 20 Mar 2014 03:55:52 -0700 Subject: [PATCH] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/52a3492784fa Author: Alive.Kuo Desc: Merge pull request #17370 from alivedise/bugzilla/961800_master_merging/child-window-factory Bug 961800 - Implement Child Window Factory, r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/a1a234a4883e Author: Alive Kuo Desc: Bug 961800 - Implement Child Window Factory Conflicts: apps/system/js/app_transition_controller.js apps/system/js/app_window.js apps/system/js/app_window_manager.js apps/system/js/cards_view.js apps/system/style/window.css --- 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 e0d2ba068302..175bc00c7c52 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "c9674d6741726fc4e28fcbef938b4b058696a049", + "revision": "52a3492784fa8492f9faaa66cc99a50e95c0d8c3", "repo_path": "/integration/gaia-central" }