CLOBBER
author Nicholas Cameron <ncameron@mozilla.com>
Tue, 22 Oct 2013 14:14:41 +0200
changeset 225286 d9d1983edb5c790457a6d2f2d7cdb1bb810430f4
parent 225149 ef058ebed6fbb248df3a9cf4272d34a5e0c2e977
permissions -rw-r--r--
Bug 914847 - Mini-flush for animations. r=dbaron, a=1.3+

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

<<<<<<< local
Bug 908695 required a clobber on Windows because bug 928195
=======
Bug 934646 needs a clobber -- the icon resources previously copied
into $OBJDIR/mobile/android/base/res will conflict with those in
$BRANDING_DIRECTORY/res.

>>>>>>> other