CLOBBER
author Gaia Pushbot <release+gaiajson@mozilla.com>
Tue, 19 Nov 2013 23:40:23 -0800
changeset 156486 0aa50437820d973a40ff6e58d844aa4220d6271b
parent 156431 6bd8ff07e16fdfce8724e1f4057af52a95543e33
child 156465 7c730b25a3df80de96286710bdf244f73c286149
permissions -rw-r--r--
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/2f041bec46d5 Author: Rex KM Lee <rexboy@mozilla.com> Desc: Merge pull request #13469 from rexboy7/fix-bug907155 bug 907155 - [System] Wake phone before shutdown to prevent blocking powerOff r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/f20a34dcf483 Author: Rex Lee <rexboy@mozilla.com> Desc: bug 907155 - [System] Wake phone before shutdown to prevent blocking powerOff

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