Sebastian Hengst 021c9d40ae merge mozilla-inbound to mozilla-central. r=merge a=merge ... MozReview-Commit-ID: CSQGyQiRacj		2016-08-22 17:28:28 +02:00
..
base	merge mozilla-inbound to mozilla-central. r=merge a=merge	2016-08-22 17:28:28 +02: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 1287710 - Ensure the docshell variable doesn't point to a dead CPOW. r=me	2016-08-16 09:22:41 -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