author Ryan VanderMeulen <>
Sat, 04 Nov 2017 13:44:15 -0400
changeset 443444 78568f0b106895cb7573fb1fa355d511ec9c87a3
parent 443068 73e0d89a540f1568387efa0e145e7853f9badb10
parent 443420 6eece4a582994d925f1b9bd28a6bd4d1ba467b27
child 444826 b9e65f782b6bd6228ffdbfee166b6dbdaeed208e
permissions -rw-r--r--
Merge mozilla-central to beta. a=merge, l10n=me on a CLOSED TREE

# To trigger a clobber replace ALL of the textual description below,
# giving a bug number and a one line description of why a clobber is
# required. Modifying this file will make configure check that a
# clobber has been performed before the build can continue.
# MERGE NOTE: When merging two branches that require a CLOBBER, you should
#             merge both CLOBBER descriptions, to ensure that users on
#             both branches correctly see the clobber warning.
#                  O   <-- Users coming from both parents need to Clobber
#               /     \
#          O               O
#          |               |
#          O <-- Clobber   O  <-- Clobber
# Note: The description below will be part of the error message shown to users.
# Modifying this file will now automatically clobber the buildbot machines \o/

# Are you updating CLOBBER because you think it's needed for your WebIDL
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.

Bug 1413550 - Activity Stream removed a bunch of files that would break ./mach package