Backed out changeset e5597c0d025d (bug 1148565) for causing merge conflicts with m-c and so blocking the merge from mozilla-inbound to mozilla-central

This commit is contained in:
Carsten "Tomcat" Book 2015-04-01 12:25:17 +02:00
parent 51f8723d56
commit 639a9467ce

View File

@ -682,7 +682,6 @@ browser.jar:
skin/classic/aero/browser/preferences/in-content/favicon.ico (../shared/incontentprefs/favicon.ico)
skin/classic/aero/browser/preferences/in-content/icons.svg (../shared/incontentprefs/icons.svg)
skin/classic/aero/browser/preferences/in-content/search.css (../shared/incontentprefs/search.css)
skin/classic/aero/browser/preferences/in-content/default-profile-image.svg (../shared/incontentprefs/default-profile-image.svg)
skin/classic/aero/browser/preferences/applications.css (preferences/applications.css)
skin/classic/aero/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css)
skin/classic/aero/browser/preferences/search.css (preferences/search.css)