07b45aaa26
Fix merge conflict bustage for removed file from bug 1307445 part A.
...
MozReview-Commit-ID: LQ5tZclbtb6
--HG--
extra : rebase_source : 01447300d41eaa074cf11658ceb8f135c7aeb27e
2016-10-18 09:32:57 -04:00
ed2a6c5769
Bug 1307445 part A - Don't ever show "A plugin is needed to display this content." or "This plugin is disabled." - Just always use fallback content or empty content. r=mconley+sebastian
...
MozReview-Commit-ID: ClnOkK3sWIK
--HG--
extra : rebase_source : 0325b830088bef3a7ee5a506041c8eafafbf50e2
2016-10-18 08:42:12 -04:00
5c6b1c9a7e
bug 1289802 - Replace 'install flash' content with click to play UI when flash is click to play r=mconley
2016-07-26 22:16:37 -04:00
5538d692d3
Bug 1286877 - do not set c-basic-offset for python-mode; r=gps
...
This removes the unnecessary setting of c-basic-offset from all
python-mode files.
This was automatically generated using
perl -pi -e 's/; *c-basic-offset: *[0-9]+//'
... on the affected files.
The bulk of these files are moz.build files but there a few others as
well.
MozReview-Commit-ID: 2pPf3DEiZqx
--HG--
extra : rebase_source : 0a7dcac80b924174a2c429b093791148ea6ac204
2016-07-14 10:16:42 -06:00
60ffe96bea
Bug 1195162 - Move mozapps/plugins into pluginproblem (r=sicking,bsmedberg)
...
--HG--
rename : toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd => toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd
rename : toolkit/mozapps/plugins/content/pluginFinderBinding.css => toolkit/pluginproblem/content/pluginFinderBinding.css
rename : toolkit/mozapps/plugins/content/pluginProblem.xml => toolkit/pluginproblem/content/pluginProblem.xml
rename : toolkit/mozapps/plugins/content/pluginProblemBinding.css => toolkit/pluginproblem/content/pluginProblemBinding.css
rename : toolkit/mozapps/plugins/content/pluginProblemContent.css => toolkit/pluginproblem/content/pluginProblemContent.css
rename : toolkit/mozapps/plugins/jar.mn => toolkit/pluginproblem/jar.mn
rename : toolkit/mozapps/plugins/moz.build => toolkit/pluginproblem/moz.build
rename : toolkit/mozapps/plugins/pluginGlue.manifest => toolkit/pluginproblem/pluginGlue.manifest
2015-09-14 19:08:06 -07:00
Benjamin Smedberg
Brad Lassey
Tom Tromey
Christoph Kerschbaumer