Wes Kocher 14c8653f72 Merge inbound to central, a=merge		2016-09-15 16:28:10 -07:00
..
crashtests	Bug 1288791 part 2. Rename WrapNativeParent to FindAssociatedGlobal and update it to actually do that. r=bkelly	2016-07-27 11:05:36 -04:00
idl	Bug 1302448 part 2 - Rename XPCJSRuntime to XPCJSContext. r=mrbkap	2016-09-14 15:48:17 +02:00
loader	Bug 1302448 part 2 - Rename XPCJSRuntime to XPCJSContext. r=mrbkap	2016-09-14 15:48:17 +02:00
public	Bug 1286877 - do not set c-basic-offset for python-mode; r=gps	2016-07-14 10:16:42 -06:00
shell	Bug 1285356: Fix blocklist initialization regressions; r=bsmedberg	2016-07-07 17:00:23 -06:00
src	Bug 1302448 part 2 - Rename XPCJSRuntime to XPCJSContext. r=mrbkap	2016-09-14 15:48:17 +02:00
tests	Bug 1302304. Remove IDL bits that reference nsIDOMMediaError; it's not needed anymore. r=bkelly	2016-09-15 11:41:35 -04:00
wrappers	Bug 1302849 part 1. Remove the now-dead SCSecurityXrayXPCWN thing. r=mrbkap	2016-09-15 11:41:45 -04:00
moz.build	Bug 1286877 - do not set c-basic-offset for python-mode; r=gps	2016-07-14 10:16:42 -06:00