Revision c8f861e2adcb56028398bc4cfcdf2316ca40e7da authored by B2G Bumper Bot on 07 April 2014, 18:20:21 UTC, committed by B2G Bumper Bot on 07 April 2014, 18:20:21 UTC
======== https://hg.mozilla.org/integration/gaia-1_3/rev/65893b72eb03 Author: Bob Silverberg <bob.silverberg@gmail.com> Desc: Merge pull request #18050 from bobsilverberg/revert_revert Bug 991657 - [v1.3] Backport test_cards_view_with_two_apps.py test to v1.3 ======== https://hg.mozilla.org/integration/gaia-1_3/rev/37604331df73 Author: Bob Silverberg <bob.silverberg@gmail.com> Desc: Fix issue with mozdevice >=0.31 on TBPL ======== https://hg.mozilla.org/integration/gaia-1_3/rev/583c3db01206 Author: Bob Silverberg <bob.silverberg@gmail.com> Desc: Revert "Revert "Merge pull request #17988 from bobsilverberg/cards_view_v1.3"" This reverts commit f43898e5c9488ae8614c71d2fe9b7c205726c471. ======== https://hg.mozilla.org/integration/gaia-1_3/rev/f34b173dd4a0 Author: Ryan VanderMeulen <ryanvm@gmail.com> Desc: Revert "Merge pull request #17988 from bobsilverberg/cards_view_v1.3" This reverts commit 76e87fb7c2aa4ae4311b92ddab3e3fd484f28094, reversing changes made to 7928935802853da76aeb5577a76678eef72d84e9.
1 parent da52300
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 ...
