CLOBBER
author Nicholas Nethercote <nnethercote@mozilla.com>
Mon, 09 May 2016 11:57:44 +1000
changeset 338507 c93401d022f5843ba19a2b8c6d590a9249cc3dfe
parent 336398 146b55a0222202b6eb98f0ead305776d8ae0fc2b
child 339180 efb574fec48e676ee6681c30849af47e3e7e4006
permissions -rw-r--r--
Bug 1271164 - Add a missing null check in user font memory reporting. r=jfkthame.

# 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 1265131 - Update Skia to m51 branch