author Brian Smith <>
Thu, 16 Jan 2014 13:18:55 -0800
changeset 163884 cbed774ff9c0050dcc1eecded386bd95538abad4
parent 163307 c8e2cb87f6c163f7fbbc1fcd5cf9bb3565d2163b
child 164173 31688c2aca28ba1014ac5153f4fba25f76107a13
permissions -rw-r--r--
Bug 958916: Update NSS to NSS 3.15.5 beta 2 (NSS_3_15_5_BETA2) plus private patch for bug 950129, CLOBBER, r=me

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

Updates to NSS seem to require a clobber due bug 959928.