Revision 49f60ede8c5fa62d96fcf24dad88bc46b4598b58 authored by Gaia Pushbot on 24 January 2014, 22:40:48 UTC, committed by Gaia Pushbot on 24 January 2014, 22:40:48 UTC
======== https://hg.mozilla.org/integration/gaia-1_3/rev/1c5561b54f7e Author: Ryan VanderMeulen <ryanvm@gmail.com> Desc: Re-land "Bug 961047 - Remove some dead code in Gaia with APZC enabled by default from the platform. r=alive,fabrice" This reverts commit cd0647684b057a9a8d02b362fa72fa41aa70bacf. ======== https://hg.mozilla.org/integration/gaia-1_3/rev/7406608ea8e0 Author: Ryan VanderMeulen <ryanvm@gmail.com> Desc: Revert "Bug 961047 - Remove some dead code in Gaia with APZC enabled by default from the platform. r=alive,fabrice" This reverts commit ffd4a72a6031461fe56cc16c89ca480a0efc1383.
1 parent 0b141e1
CLOBBER
# 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
Computing file changes ...
