author Nathan Froyd <>
Wed, 09 May 2018 17:26:31 -0400
changeset 474402 758cb28b70144afa10405624044bec305f101dc2
parent 473835 2d95d70298e248161b629ef1d0d57049c0b62d71
child 475075 1eb04a9bfb7a82eb6fac5e29be7c6b03999d9361
permissions -rw-r--r--
Bug 1460367 - move audio sample-related settings to moz.configure; r=ted.mielczarek,nalexander With moz.configure, it's a little more obvious that MOZ_TREMOR and MOZ_VORBIS are mutually exclusive.

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

Merge day clobber