Ed Morley 000d251175 Merge latest green b2g-inbound changeset and mozilla-central; a=merge		2014-08-15 16:54:17 +01:00
..
gonk	Merge latest green b2g-inbound changeset and mozilla-central; a=merge	2014-08-15 16:54:17 +01:00
tests/marionette	Backed out changeset 52fc270e59ad (bug 1051754) for intermittent test failures	2014-08-14 17:40:04 +01:00
moz.build	Bug 933141 - Move NFC files out of system/gonk. r=gps, dimi	2014-08-01 17:23:14 +08:00
MozNDEFRecord.cpp	Bug 1025973 - Part 1: Rename GlobalObject::GetContext() to Context(). r=bz	2014-06-16 14:08:00 -04:00
MozNDEFRecord.h	Bug 1009675 part 3. Return WebIDL 'object' values as handles. r=peterv	2014-06-11 16:26:52 -04:00
NfcContentHelper.js	Bug 1052311 - B2G NFC: remove warnings from Nfc.js and NfcContentHelper.js. r=dimi	2014-08-12 17:04:51 +08:00
nsINfcContentHelper.idl	Bug 933141 - Move NFC files out of system/gonk. r=gps, dimi	2014-08-01 17:23:14 +08:00
nsNfc.js	Bug 1051738 - B2G NFC: typo in getNFCPeer. r=dimi	2014-08-11 17:19:11 +08:00
nsNfc.manifest