CLOBBER
author Kit Cambridge <kcambridge@mozilla.com>
Fri, 06 Nov 2015 10:30:25 -0800
changeset 305481 0e9c6096f7e9d4deb0c7f98f88b5e032987bc2bd
parent 305328 bc4551debe178baf41cc2270797fcaffe3693c46
child 305542 3f63e0a21969587cb4fb7116573763f8c55e2cb4
child 306236 3adbe4cbbfdd2d7516baafa3edcfc7a624856a8c
permissions -rw-r--r--
Bug 1221330 - Show the app icon in the XUL upgraded notifications alert. r=MattN, a=ritu

# 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