Bumping gaia.json for 6 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/e3d420758d53
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Merge pull request #15362 from chirarobert/new_branch

Bug 936505 - Neaten up test_settings_wallpaper

========

https://hg.mozilla.org/integration/gaia-central/rev/15230e9673bc
Author: chirarobert <chirarobert@yahoo.com>
Desc: Bug 936505 - Neaten up test_settings_wallpaper
Changed to assert wallpaper.image setting instead of taking the info from html

========

https://hg.mozilla.org/integration/gaia-central/rev/a8ffdd25c5e7
Author: Yuren Ju <yurenju@gmail.com>
Desc: Revert "Bug 957497 - Allow include of uncompressed data files in the package apps"

This reverts commit 3eb52bf51d1ce57cdbbf9ee8cade488d77985ef1.

Conflicts:
	build/utils-xpc.js
	build/utils.js

========

https://hg.mozilla.org/integration/gaia-central/rev/543c4ab39c46
Author: Yuren Ju <yurenju@gmail.com>
Desc: Revert "Bug 957497 - Enable alignStoredFiles()"

This reverts commit 21f03c19a6659580b83004ae2757b539b1ee9782.

========

https://hg.mozilla.org/integration/gaia-central/rev/c99908aef26b
Author: Yuren Ju <yurenju@gmail.com>
Desc: Revert "Bug 962976 - Use a blacklist to avoid compressing specific file types which are already compressed r=yurenju"

This reverts commit 6c99ac252d1c75b06b3883e98d8ea36913ea36f1.

========

https://hg.mozilla.org/integration/gaia-central/rev/22795ff39d85
Author: Yuren Ju <yurenju@gmail.com>
Desc: Revert "Bug 962938 - Inconsistent file path in zip file"

This reverts commit 27c9fbbdac521950cb149848a73080d62312c7f4.
This commit is contained in:
B2G Bumper Bot 2014-01-28 19:25:15 -08:00
parent 46ac5d031d
commit 133f02b58c

View File

@ -1,4 +1,4 @@
{
"revision": "5b3330fb7532d5027849ae6be5e431ccf4ef8cdf",
"revision": "e3d420758d5394a699be4b35e7c59438c7ae1cf7",
"repo_path": "/integration/gaia-central"
}