CLOBBER
author James Graham <james@hoppipolla.co.uk>
Fri, 06 Mar 2015 14:17:42 +0000
changeset 232295 654410ceb288ea6fb2b89f66aa5c030cf0b04f9c
parent 230281 9b077c6f3d02d03d98e7f93086b8735e5e811ec0
child 232432 fac66b2cc608319bf5b3f015bf07cd477767df8a
permissions -rw-r--r--
Bug 1140145 - Fixup incorrectly merged wpt metadata

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

Merge day clobber