CLOBBER
author B2G Bumper Bot <release+b2gbumper@mozilla.com>
Wed, 15 Apr 2015 03:40:14 -0700
changeset 239272 9a2bcb07b56c700280d2a4d1330f59bb8859033a
parent 239271 aa696047a7790f91ddf29bea9c8eb77f4388da52
child 239443 ed90daa452972ca497be139fb017d3ca5f3bb8a8
permissions -rw-r--r--
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/54a9866e1de2 Author: autolander <bug.autolander@gmail.com> Desc: Bug 1152938 - merge pull request #29453 from albertopq:1152938-rocketbar-sim to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/f91849f78e80 Author: albertopq <albert.pastor@gmail.com> Desc: Bug 1152938 - Preventing rocketbar when search input is not visible ======== https://hg.mozilla.org/integration/gaia-central/rev/69c424997207 Author: autolander <bug.autolander@gmail.com> Desc: Bug 1149443 - merge pull request #29514 from crh0716:1149443 to mozilla-b2g:master ======== https://hg.mozilla.org/integration/gaia-central/rev/94665883df49 Author: Arthur Chen <crh0716@gmail.com> Desc: Bug 1149443 - Add missing attribute for multiple buttons

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

# Are you updating CLOBBER because you think it's needed for your WebIDL
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.

Bug 1153796: Merge Bluetooth backend interfaces