gecko/b2g
B2G Bumper Bot 3406ecbfee Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/186dc9242740
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #17766 from julienw/revert-bad-revert

Revert "Revert "Merge pull request #17263 from gasolin/bubble-merge225" ...

========

https://hg.mozilla.org/integration/gaia-central/rev/fc3ccbc1f7e1
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 989418 - Revert "Revert "Merge pull request #17263 from gasolin/bubble-merge225" for possibly breaking gaia-ui tests on TBPL"

This reverts commit a9aa1882f4b0e472f3686b157eb119d17ae60a91.
The original revert broke a lot of things and was not done correctly.

Conflicts:
	apps/clock/js/panels/timer/panel.html
	shared/style_unstable/input_areas.css

========

https://hg.mozilla.org/integration/gaia-central/rev/b82006c4b2c8
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #17809 from davehunt/bug989951

Bug 989951 - Bump gaiatest version to 0.21.10

========

https://hg.mozilla.org/integration/gaia-central/rev/1c5240dd926d
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 989951 - Bump gaiatest version to 0.21.10. r=fstrugariu
2014-03-31 06:06:15 -07:00
..
app Merge b2g-inbound to m-c 2014-03-28 16:38:35 -07:00
branding
chrome Bug 988129 - Correct the chaotic naming styles in system message codes (part 3, s/uri/pageURL). r=fabrice 2014-03-31 16:04:36 +08:00
components Bug 985796 - Port the permission settings API to WebIDL; r=bzbarsky 2014-03-22 09:58:24 -04:00
config Bumping gaia.json for 4 gaia revision(s) a=gaia-bump 2014-03-31 06:06:15 -07:00
gaia
installer Bug 860731 - Part d: Fix packaging; r=janv 2014-03-24 16:11:16 +01:00
locales
simulator Bug 987411 - Fix Simulator path to b2g on Mac. r=ochameau 2014-03-27 11:40:25 -04:00
test
app.mozbuild
build.mk Bug 944451 - Land simulator addon into mozilla-central. r=vingtetun, r=gps, r=paul 2014-03-03 14:50:40 -05:00
confvars.sh Bug 962187 - Tracking bug for 17-mar-2014 migration work. Bump b2g version. r=aki CLOSED TREE 2014-03-17 18:42:09 -04:00
LICENSE
Makefile.in
moz.build