Phil Ringnalda 6f55fab2bf Merge m-i to m-c, a=merge		2017-01-19 22:04:52 -08:00
..
base	Bug 1330332 - Add support for handling global history changes with PendingGlobalHistoryEntry for prerendering, r=smaug	2017-01-19 15:26:17 -05: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 1329032 - Extend loadURIWithOptions by a triggeringPrincipal. r=bz,gijs	2017-01-18 08:24:55 +01:00
test	Backed out changeset 0c891a3aff93 (bug 1303113) for test-oop-extensions failures a=backout CLOSED TREE	2017-01-19 11:29:42 -08:00
moz.build	Bug 1286877 - do not set c-basic-offset for python-mode; r=gps	2016-07-14 10:16:42 -06:00