Wes Kocher e9097643d5 Merge inbound to central, a=merge		2016-08-12 13:44:29 -07:00
..
base	Merge inbound to central, a=merge	2016-08-12 13:44:29 -07:00
build	Bug 1288650 - Export mac/nsOSHelperAppService.h instaed of win/nsOSHelperAppService.h on OSX builder. r=mshal	2016-07-28 13:12:39 +09:00
resources/content	Bug 1286877 - do not set c-basic-offset for python-mode; r=gps	2016-07-14 10:16:42 -06:00
shistory	Bug 1293603 (part 2) - Make Run() declarations consistent. r=erahm.	2016-08-08 12:18:10 +10:00
test	Bug 1288049 - Canonicalize IPv4 for nsStandardURL, r=valentin	2016-08-09 03:18:00 +02:00
moz.build	Bug 1286877 - do not set c-basic-offset for python-mode; r=gps	2016-07-14 10:16:42 -06:00