gecko-dev/b2g/config
Gaia Pushbot 95bad69206 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5bfef5faac50
Author: evelynhung <jj.evelyn@gmail.com>
Desc: Merge pull request #14368 from svic/rebase-df070d4e-NFC-Settings-permission

Bug 946047: Add nfc read only permissions to Settings UI to allow navigator.mozNfc DOM to be created. r=evelyn

========

https://hg.mozilla.org/integration/gaia-central/rev/faaf2b447dad
Author: Garner Lee <garner.lee@telekom.com>
Desc: Bug 946047: Add nfc read only permissions to Settings UI to allow navigator.mozNfc DOM to be created.

This fix is needed for apps using NFC if "HasNfcSupport" is added to the navigator MozNfc WebIDL.

Conflicts:
	apps/settings/manifest.webapp
2013-12-11 21:10:23 -08:00
..
emulator bug 872765 - b2g emulator package-tests, upload the tests. r=jgriffin 2013-05-28 19:03:50 -07:00
emulator-ics Bug 921071 - Add in-tree configs for B2G emulator-ics. r=aki 2013-09-26 15:06:35 -04:00
emulator-jb Bug 885630: gecko configs for emulator-jb builds. r=aki DONTBUILD 2013-08-28 13:45:08 -04:00
hamachi Bug 934602 - [Buri] Update 1.2 blobs from OEM build for 1.2 and 1.3 channels. r=rail a=NPOTB 2013-12-03 13:30:05 -05:00
helix Bug 939315 - Please update the Helix blobs for 1.3, 1.2, 1.1 HD with the 20131106 build blobs. r=rail a=NPOTB 2013-12-03 15:37:12 -05:00
inari No bug: remove B2GUPDATER environment variables. they do nothing! r=Callek 2013-10-17 11:02:22 -04:00
leo No bug: remove B2GUPDATER environment variables. they do nothing! r=Callek 2013-10-17 11:02:22 -04:00
mako No bug: remove B2GUPDATER environment variables. they do nothing! r=Callek 2013-10-17 11:02:22 -04:00
mozconfigs Bug 946576 - Disable unified builds on b2g and xulrunner builds, and android debug builds. r=ehsan 2013-12-06 08:45:29 +09:00
tooltool-manifests Bug 823906 - Last clang update on the 3.2 branch. r=rail. 2012-12-24 09:54:37 -05:00
unagi bug 931716 - add gecko files to unagi uploads. r=catlee 2013-11-01 12:08:27 -07:00
gaia.json Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump 2013-12-11 21:10:23 -08:00