author Carsten "Tomcat" Book <>
Tue, 28 Oct 2014 16:10:23 +0100
changeset 237058 7155fda159c1ae2db49155002dcf0b31ef04e034
parent 237036 5f3eeddf3de79ec900321c574d96788e95ced83c
parent 236906 b9c041b4c894c29c37e014c7632befba92995955
child 237112 01ac588cd1231ec0000626ed242beb2043296a76
permissions -rw-r--r--
Merge mozilla-central to b2g-inbound

# 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.

Updating CLOBBER for Bug 1084342

There are some refactored files in in dom/bluetooth. Updating CLOBBER to not
leave artifacts from older builds.