Ryan VanderMeulen b7ee0074f3 Merge m-c to inbound. a=merge		2015-03-25 13:43:32 -04:00
..
base	Bug 1143665 - Remove the ambiguous scroll position being passed around in scroll started/stop notifications. r=roc,ehsan	2015-03-25 07:52:37 -04:00
build	bug 1096718 - - display time measured spent in each compartment r=billm,mossop	2015-01-13 17:38:05 -08:00
resources/content	Bug 529697 - (CSP 1.1) Implement form-action directive [3/4], r=unfocused	2014-11-15 03:08:00 +01:00
shistory	Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj	2015-03-21 12:28:04 -04:00
test	Bug 1100291 - Fix docshell/test/browser/browser_uriFixupIntegration.js to properly work with an async version of getShortcutOrURIAndPostData() and make it e10s compatible r=Gijs	2015-03-06 16:37:26 +01:00
moz.build	Bug 1141190 - Remove docshell/test/moz.build; r=mshal	2015-03-11 10:49:04 +01:00