CLOBBER
author Botond Ballo <botond@mozilla.com>
Fri, 18 Nov 2016 13:01:56 -0500
changeset 370600 0fc9b3fb2d5d2630e6727d848d5b9cd27b5b32b0
parent 369651 a516c754042c438a5c1499171ca525a980ecb911
child 369516 caca7170b92ee7874322eba772c15c9416a5ef5d
child 371743 c5c8bd440978ec31deb66443bc2b17095e4a9fa4
permissions -rw-r--r--
Bug 1318730 - Fire the ScrollInputMethod::MainThreadScrollbarTrackClick telemetry probe in the non-scrollToClick case as well. r=kats MozReview-Commit-ID: EQRu1NwYQDM

# 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