Bumping gaia.json for 2 gaia-1_3 revision(s) a=gaia-bump
authorGaia Pushbot <release+gaiajson@mozilla.com>
Thu, 09 Jan 2014 16:01:15 -0800
changeset 174671 9fd47db0a2f10ce54a70e811c71fe4fae09ef717
parent 174670 5dea5f208bf14d5de9052da1e0e509c8631709f7
child 174672 24f7fca4ab5dfd34e75ef14ae370828f8f54e9c2
push id3224
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:06:49 +0000
treeherdermozilla-beta@60c04d0987f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgaia-bump
bugs14884, 950171, 14224, 944749
milestone28.0a2
Bumping gaia.json for 2 gaia-1_3 revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-1_3/rev/d571d8bc76b1 Author: Fabien Cazenave <fabien@cazenave.cc> Desc: Merge pull request #14884 from flodolo/bug950171 Bug 950171 - [settings] "Improve Firefox OS" title displayed as "Improve {{brandShortName}}" (cherry picked from commit b3baaadf40db67d8e5812de7a7bb0cdea26844b1) (cherry picked from commit 1a5b5d779c5482124b4887cc40c7b853fcd4759a) ======== https://hg.mozilla.org/integration/gaia-1_3/rev/a667c67e9383 Author: Timothy Guan-tin Chien <timdream@gmail.com> Desc: Merge pull request #14224 from flodolo/separate_header Bug 944749 - [Settings][l12y] Use different labels for menu items and headers, r=kaze (cherry picked from commit 588a3e02c4ace3b3341ba1f6bb7274120b53b2b3) Removed change to apps/settings/elements/improve_browser_os.html which is going to be fixed by Bug 950171 (originally follow-up of this bug) Conflicts: apps/settings/elements/downloads.html apps/settings/locales/settings.en-US.properties (cherry picked from commit d256a30ef3fbdf8d70cfff2c12926df2ab9bf903)
b2g/config/gaia.json
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "1403af671e247d9895cca96d5bb9b3050036d832", 
+    "revision": "d571d8bc76b1cec416251e6a84e051603346bd4e", 
     "repo_path": "/integration/gaia-1_3"
 }