gecko-dev/toolkit
Benjamin Smedberg 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
..
components Merge inbound to central, a=merge 2016-10-17 15:34:14 -07:00
content Backed out changeset 9d11e38b5fcf for bc test failure (bug 1308775) 2016-10-18 18:16:27 +09:00
crashreporter Bug 1280477 - Import jsoncpp into the source tree and integrate it into the build r=ted 2016-10-13 11:19:05 +02:00
forgetaboutsite Bug 1294547 - Enable the comma-spacing rule for eslint. r=felipe 2016-08-16 15:44:15 -04:00
identity Bug 1298879 - Upgrade to ESLint 3.5.0 for faster linting. r=miker 2016-09-20 10:27:03 +01:00
library bug 1305731 - Revert workaround from bug 1301751 now that we have updated to Rust 1.12. r=froydnj 2016-10-17 10:47:30 -04:00
locales 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 2016-10-18 08:42:12 -04:00
modules merge mozilla-inbound to mozilla-central a=merge 2016-10-12 12:01:48 +02:00
mozapps 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 2016-10-18 08:42:12 -04:00
obsolete Bug 1292042 - Enable the keyword-spacing rule for eslint. Most of this patch was autogenerated by 'eslint --fix'. Files with .xml extension needed to be changed by hand due to limitations of custom plugin. r=markh 2016-08-04 03:28:58 -04:00
pluginproblem Fix merge conflict bustage for removed file from bug 1307445 part A. 2016-10-18 09:32:57 -04:00
profile Bug 977786 - Add tests for nsProfileLock. r=ted 2016-09-16 17:31:14 +02:00
system Bug 862395 - Part 1: Add requireInteraction property to web notifications. r=baku 2016-10-12 17:27:40 -07:00
themes 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 2016-10-18 08:42:12 -04:00
xre Backed out changeset f82c28837b07 (bug 1299707) for crashes @ gdk_disable_multidevice 2016-10-18 11:44:01 +08:00
.eslintrc Bug 1294542 - Enable the block-spacing rule for eslint. r=felipe 2016-08-16 21:27:37 -04:00
moz.build
moz.configure Backed out 5 changesets (bug 1305145) for windows build failures a=backout 2016-10-14 13:07:58 -07:00
nss.configure Bug 1295480 - Move --enable-dbm to python configure. r=chmanchester 2016-08-17 11:01:44 +09:00
toolkit.mozbuild Backed out changeset 1df8bde64853 (bug 1302364) 2016-09-16 11:24:29 +02:00