author vivek <>
Tue, 15 Dec 2015 19:23:14 +0200
changeset 331123 1fb7f5141d84acf7aacd985a996f02144816b2b2
parent 329975 159e0a5a653f2789e0c9b94f41501a4a44f7cb34
child 333904 2dfa7f4446b817c637733977d88947aa223a8ee3
child 334716 12ad2dac1f7c4a4ea9dc744e78790f9977447e00
child 338019 0e4c29a5ea1568f9ddaee553ca2f45111ecb27ef
permissions -rw-r--r--
Bug 946857 - pre : Expose disabled hosts through Password CP r?nalexander Added a simple robocop test to verify that it is possible to query disabledHosts with PasswordProviders. MozReview-Commit-ID: K4j4Aczp2xv

# 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 1246756 - Update Skia to m49 branch.