author Henri Sivonen <>
Fri, 18 Jan 2013 16:27:03 +0200
changeset 119257 010f52e1cf84d3d89faf3985c7e79c4ff06a33a7
parent 118881 81a519d21a1e1590ce7dba3fbab26844935337fd
child 120562 c6e5bf0eb51a1a3c291e96c47bae8b30d52b56ba
permissions -rw-r--r--
Bug 234628 part 2 - Make manual encoding overrides not apply to internal URL schemes or to docs declared as UTF-16 on the HTTP level; make docshells able to report when the encoding menu should be disabled. r=bzbarsky.

# 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.
Bug 830231 - Remove nsIDOMDOM(Settable)TokenList (Needs clobber on at least Windows)