Merge mozilla-central and tracemonkey. (a=blockers)
commite3a1d4aed352c9fbd21db8f15336bc5248b681e2
authorChris Leary <cdleary@mozilla.com>
Fri, 21 Jan 2011 04:47:21 +0000 (20 20:47 -0800)
committerChris Leary <cdleary@mozilla.com>
Fri, 21 Jan 2011 04:47:21 +0000 (20 20:47 -0800)
tree8692edc1e387db5df406d23954edf9e6bea0d32c
parent76a6a816ad9da21a593958ebd699e95f2f82bbd6
parent1e2f0b3b3a94c493d6042964fc7e8c8a3f953eaa
Merge mozilla-central and tracemonkey. (a=blockers)
56 files changed:
intl/unicharutil/note.txt
js/src/xpconnect/loader/mozJSComponentLoader.cpp
layout/reftests/css-invalid/button/button-button.html
layout/reftests/css-invalid/button/button-disabled-fieldset-1.html
layout/reftests/css-invalid/button/button-disabled-fieldset-2.html
layout/reftests/css-invalid/button/button-dyn-disabled.html
layout/reftests/css-invalid/button/button-dyn-not-disabled.html
layout/reftests/css-invalid/button/button-fieldset-legend-ref.html
layout/reftests/css-invalid/button/button-fieldset-legend.html
layout/reftests/css-invalid/button/button-fieldset-ref.html
layout/reftests/css-invalid/button/button-reset.html
layout/reftests/css-invalid/button/button-type-barred.html
layout/reftests/css-invalid/button/button-type-invalid.html
layout/reftests/css-submit-invalid/button-submit/self-invalid.html
layout/reftests/css-submit-invalid/input-image/self-invalid.html
layout/reftests/css-submit-invalid/input-submit/self-invalid.html
layout/reftests/css-ui-invalid/button/button-button.html
layout/reftests/css-ui-invalid/button/button-disabled-fieldset-1.html
layout/reftests/css-ui-invalid/button/button-disabled-fieldset-2.html
layout/reftests/css-ui-invalid/button/button-disabled.html
layout/reftests/css-ui-invalid/button/button-dyn-disabled.html
layout/reftests/css-ui-invalid/button/button-dyn-not-disabled.html
layout/reftests/css-ui-invalid/button/button-fieldset-legend-ref.html
layout/reftests/css-ui-invalid/button/button-fieldset-legend.html
layout/reftests/css-ui-invalid/button/button-fieldset-ref.html
layout/reftests/css-ui-invalid/button/button-novalidate.html
layout/reftests/css-ui-invalid/button/button-reset.html
layout/reftests/css-ui-invalid/button/button-type-barred.html
layout/reftests/css-ui-invalid/button/button-type-invalid.html
layout/reftests/css-ui-valid/button/button-button.html
layout/reftests/css-ui-valid/button/button-disabled-fieldset-1.html
layout/reftests/css-ui-valid/button/button-disabled-fieldset-2.html
layout/reftests/css-ui-valid/button/button-disabled.html
layout/reftests/css-ui-valid/button/button-dyn-disabled.html
layout/reftests/css-ui-valid/button/button-dyn-not-disabled.html
layout/reftests/css-ui-valid/button/button-fieldset-legend-ref.html
layout/reftests/css-ui-valid/button/button-fieldset-legend.html
layout/reftests/css-ui-valid/button/button-fieldset-ref.html
layout/reftests/css-ui-valid/button/button-novalidate.html
layout/reftests/css-ui-valid/button/button-reset.html
layout/reftests/css-ui-valid/button/button-type-barred.html
layout/reftests/css-ui-valid/button/button-type-invalid.html
layout/reftests/css-valid/button/button-button.html
layout/reftests/css-valid/button/button-disabled-fieldset-1.html
layout/reftests/css-valid/button/button-disabled-fieldset-2.html
layout/reftests/css-valid/button/button-dyn-disabled.html
layout/reftests/css-valid/button/button-dyn-not-disabled.html
layout/reftests/css-valid/button/button-fieldset-legend-ref.html
layout/reftests/css-valid/button/button-fieldset-legend.html
layout/reftests/css-valid/button/button-fieldset-ref.html
layout/reftests/css-valid/button/button-reset.html
layout/reftests/css-valid/button/button-type-barred.html
layout/reftests/css-valid/button/button-type-invalid.html
parser/htmlparser/tests/htmlgen/htmlgen.cpp
parser/htmlparser/tests/htmlgen/htmlgen.html
toolkit/themes/gnomestripe/global/icons/folder-item.png