CLOBBER
author Nick Alexander <nalexander@mozilla.com>
Wed, 11 Dec 2013 21:20:11 -0800
changeset 225149 ef058ebed6fbb248df3a9cf4272d34a5e0c2e977
parent 224587 1c599e4e665025063bc6219f45bddb64233f1a68
permissions -rw-r--r--
Bug 934646 - Clobber. r=me, a=bajaj

# 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