CLOBBER
author Nick Alexander <nalexander@mozilla.com>
Wed, 11 Dec 2013 21:20:11 -0800
changeset 160095 9be250f7458f6057a5899195b5e44ac3cc975547
parent 160013 9bc6da580a399618c48a093ecf578f77aaeb6b69
child 160192 3df5b335e5a863db34f4f4cd34ab802d91351ca6
child 160233 d4725eeb419df1408e3fb56241898f904411d31e
child 160266 0cf1107e27916d94756fc088f8986b77275072ce
permissions -rw-r--r--
Bug 934646 - Clobber. r=me

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

Bug 934646 needs a clobber -- the icon resources previously copied
into $OBJDIR/mobile/android/base/res will conflict with those in
$BRANDING_DIRECTORY/res.