merging
commit02f9b364fd9dda0bc0413bae7ab02e625d89bdaf
authortimeless@mozdev.org <timeless@mozdev.org>
Tue, 5 Jan 2010 22:50:02 +0000 (5 23:50 +0100)
committertimeless@mozdev.org <timeless@mozdev.org>
Tue, 5 Jan 2010 22:50:02 +0000 (5 23:50 +0100)
tree0f45b6122f6ca9966c0ecae38e0cf9004decc854
parent0b0ff25e70e39a00fdc49860d2dad325a0521952
parentfaab186436c93994c873e0e0a95b482c1db03a61
merging
209 files changed:
accessible/public/msaa/ISimpleDOMDocument.idl
accessible/public/msaa/ISimpleDOMNode.idl
accessible/public/msaa/Makefile.in
accessible/src/msaa/CAccessibleAction.cpp
accessible/src/msaa/CAccessibleComponent.cpp
accessible/src/msaa/CAccessibleEditableText.cpp
accessible/src/msaa/CAccessibleHypertext.cpp
accessible/src/msaa/CAccessibleImage.cpp
accessible/src/msaa/CAccessibleText.cpp
accessible/src/msaa/CAccessibleValue.cpp
accessible/src/msaa/nsAccessibleRelationWrap.cpp
accessible/src/msaa/nsApplicationAccessibleWrap.cpp
accessible/src/msaa/nsXULMenuAccessibleWrap.cpp
accessible/src/msaa/nsXULMenuAccessibleWrap.h
accessible/src/other/nsAccessibleWrap.h
browser/components/preferences/handlers.css
browser/components/preferences/handlers.xml
browser/locales/en-US/chrome/browser/preferences/applications.dtd
browser/locales/en-US/chrome/browser/search.properties
browser/locales/en-US/installer/mui.properties
browser/locales/en-US/installer/override.properties
browser/locales/en-US/searchplugins/amazondotcom.xml
browser/locales/en-US/searchplugins/creativecommons.xml
browser/locales/en-US/searchplugins/eBay.xml
browser/themes/gnomestripe/browser/Go-arrow.png
browser/themes/gnomestripe/browser/feeds/audioFeedIcon.png
browser/themes/gnomestripe/browser/feeds/audioFeedIcon16.png
browser/themes/gnomestripe/browser/feeds/feedIcon.png
browser/themes/gnomestripe/browser/feeds/feedIcon16.png
browser/themes/gnomestripe/browser/feeds/videoFeedIcon.png
browser/themes/gnomestripe/browser/feeds/videoFeedIcon16.png
browser/themes/gnomestripe/browser/monitor.png
browser/themes/gnomestripe/browser/places/bookmarksMenu.png
browser/themes/gnomestripe/browser/places/places.css
browser/themes/gnomestripe/browser/places/query.png
browser/themes/gnomestripe/browser/places/tag.png
browser/themes/gnomestripe/browser/places/toolbarDropMarker.png
browser/themes/gnomestripe/browser/tabbrowser/tabDragIndicator.png
browser/themes/pinstripe/browser/feeds/audioFeedIcon.png
browser/themes/pinstripe/browser/feeds/audioFeedIcon16.png
browser/themes/pinstripe/browser/feeds/feedIcon.png
browser/themes/pinstripe/browser/feeds/feedIcon16.png
browser/themes/pinstripe/browser/feeds/videoFeedIcon.png
browser/themes/pinstripe/browser/feeds/videoFeedIcon16.png
browser/themes/pinstripe/browser/places/bookmarksMenu.png
browser/themes/pinstripe/browser/places/bookmarksToolbar.png
browser/themes/pinstripe/browser/places/history.png
browser/themes/pinstripe/browser/places/livemarkItem.png
browser/themes/pinstripe/browser/places/query.png
browser/themes/pinstripe/browser/places/tag.png
browser/themes/pinstripe/browser/tabbrowser/tabDragIndicator.png
browser/themes/winstripe/browser/Go-arrow-aero.png
browser/themes/winstripe/browser/Secure-aero.png
browser/themes/winstripe/browser/Secure24-aero.png
browser/themes/winstripe/browser/Secure24.png
browser/themes/winstripe/browser/Security-broken-aero.png
browser/themes/winstripe/browser/feeds/audioFeedIcon.png
browser/themes/winstripe/browser/feeds/audioFeedIcon16.png
browser/themes/winstripe/browser/feeds/feedIcon.png
browser/themes/winstripe/browser/feeds/feedIcon16.png
browser/themes/winstripe/browser/feeds/videoFeedIcon.png
browser/themes/winstripe/browser/feeds/videoFeedIcon16.png
browser/themes/winstripe/browser/livemark-folder-aero.png
browser/themes/winstripe/browser/livemark-item-aero.png
browser/themes/winstripe/browser/menu-back-aero.png
browser/themes/winstripe/browser/menu-back.png
browser/themes/winstripe/browser/menu-forward-aero.png
browser/themes/winstripe/browser/menu-forward.png
browser/themes/winstripe/browser/places/bookmarksMenu.png
browser/themes/winstripe/browser/places/bookmarksToolbar.png
browser/themes/winstripe/browser/places/history-aero.png
browser/themes/winstripe/browser/places/history.png
browser/themes/winstripe/browser/places/query.png
browser/themes/winstripe/browser/places/starred48-aero.png
browser/themes/winstripe/browser/places/tag.png
browser/themes/winstripe/browser/places/toolbarDropMarker.png
browser/themes/winstripe/browser/tabbrowser/tabDragIndicator.png
content/base/src/nsGkAtoms.cpp
content/svg/content/src/crashtests/428228-1.svg
content/svg/content/src/nsSVGInteger.cpp
content/svg/content/src/nsSVGInteger.h
content/xslt/Makefile.in
content/xslt/tests/buster/jar.mn
content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp
intl/lwbrk/src/nsUniscribeBreaker.cpp
js/src/build/autoconf/acoutput-fast.pl
js/src/build/win32/pgomerge.py
modules/libpr0n/public/imgIEncoder.idl
modules/libpr0n/test/unit/image2jpg16x16-win.png
modules/libpr0n/test/unit/image2jpg32x32-win.png
modules/libpref/public/nsIPrefBranch2.idl
nsprpub/pr/tests/poll_er.c
nsprpub/pr/tests/selct_er.c
other-licenses/branding/firefox/dsstore
profile/dirserviceprovider/src/nsProfileDirServiceProvider.cpp
security/nss/lib/libpkix/include/pkix_revchecker.h
security/nss/lib/libpkix/pkix/checker/pkix_revocationchecker.h
security/nss/lib/libpkix/pkix/params/pkix_trustanchor.c
security/nss/lib/libpkix/pkix/results/pkix_verifynode.c
security/nss/lib/libpkix/pkix/top/pkix_build.h
testing/extensions/community/chrome/content/litmus.js
testing/extensions/community/chrome/content/prefs.js
testing/extensions/community/chrome/content/qa.js
testing/extensions/community/chrome/content/settings.js
testing/extensions/community/chrome/content/tabs/qmo.js
testing/extensions/community/chrome/locale/en-US/qa.properties
testing/extensions/community/chrome/locale/en-US/urls.properties
testing/extensions/community/chrome/skin/qa.css
testing/sisyphus/bin/userhook-checkspider.js
testing/sisyphus/data/firefox,1.8.0,debug.data
testing/sisyphus/data/firefox,1.8.0,opt.data
testing/sisyphus/data/firefox,1.8.0-test,debug.data
testing/sisyphus/data/firefox,1.8.0-test,opt.data
testing/sisyphus/data/firefox,1.8.1,debug.data
testing/sisyphus/data/firefox,1.8.1,opt.data
testing/sisyphus/data/firefox,1.8.1-test,debug.data
testing/sisyphus/data/firefox,1.8.1-test,opt.data
testing/sisyphus/data/firefox,1.9.0,debug.data
testing/sisyphus/data/firefox,1.9.0,opt.data
testing/sisyphus/data/firefox,1.9.0-test,debug.data
testing/sisyphus/data/firefox,1.9.0-test,opt.data
testing/sisyphus/data/js,1.8.1,debug.data
testing/sisyphus/data/js,1.8.1,opt.data
testing/sisyphus/data/js,1.9.0,debug.data
testing/sisyphus/data/js,1.9.0,opt.data
testing/sisyphus/tests/mozilla.org/download-page/collect-urls-userhook.js
testing/sisyphus/tests/mozilla.org/download-page/userhook.js
toolkit/components/autocomplete/tests/unit/test_autocomplete_multiple.js
toolkit/components/contentprefs/tests/unit/head_contentPrefs.js
toolkit/components/feeds/test/xml/rss2/feed_pubDate_nonRFC822_1.xml
toolkit/components/feeds/test/xml/rss2/feed_pubDate_nonRFC822_2.xml
toolkit/components/places/tests/unit/test_408221.js
toolkit/components/places/tests/unit/test_history_autocomplete_tags.js
toolkit/crashreporter/google-breakpad/src/common/windows/Makefile.in
toolkit/locales/en-US/chrome/mozapps/downloads/unknownContentType.dtd
toolkit/locales/en-US/chrome/mozapps/downloads/unknownContentType.properties
toolkit/locales/en-US/chrome/mozapps/update/updates.properties
toolkit/mozapps/downloads/content/helperApps.js
toolkit/mozapps/extensions/content/blocklist.xul
toolkit/mozapps/extensions/content/list.js
toolkit/mozapps/extensions/content/list.xul
toolkit/mozapps/extensions/jar.mn
toolkit/mozapps/installer/windows/nsis/AppAssocReg.dll
toolkit/mozapps/installer/windows/nsis/ShellLink.dll
toolkit/mozapps/installer/windows/nsis/UAC.dll
toolkit/mozapps/installer/windows/nsis/makensis.mk
toolkit/mozapps/installer/windows/nsis/nsProcess.dll
toolkit/mozapps/jar.mn
toolkit/mozapps/update/content/updates.css
toolkit/mozapps/update/jar.mn
toolkit/mozapps/update/src/updater/module.ver
toolkit/themes/pinstripe/global/dirListing/folder.png
toolkit/themes/pinstripe/global/dirListing/local.png
toolkit/themes/pinstripe/global/dirListing/remote.png
toolkit/themes/pinstripe/global/dirListing/up.png
toolkit/themes/pinstripe/global/menu/menu-arrow-dis-rtl.gif
toolkit/themes/pinstripe/mozapps/places/tagContainerIcon.png
toolkit/themes/winstripe/global/console/bullet-error.png
toolkit/themes/winstripe/global/console/bullet-question.png
toolkit/themes/winstripe/global/console/bullet-warning.png
toolkit/themes/winstripe/global/console/console-toolbar.png
toolkit/themes/winstripe/global/dirListing/folder.png
toolkit/themes/winstripe/global/dirListing/local.png
toolkit/themes/winstripe/global/dirListing/remote.png
toolkit/themes/winstripe/global/dirListing/up.png
toolkit/themes/winstripe/global/icons/Print-preview.png
toolkit/themes/winstripe/global/icons/blacklist_favicon-aero.png
toolkit/themes/winstripe/global/icons/blacklist_large-aero.png
toolkit/themes/winstripe/global/icons/close.png
toolkit/themes/winstripe/global/icons/notfound.png
toolkit/themes/winstripe/global/icons/wrap.png
toolkit/themes/winstripe/mozapps/extensions/extensionIcons-aero.png
toolkit/themes/winstripe/mozapps/extensions/notifyBadges.png
toolkit/themes/winstripe/mozapps/extensions/question.png
toolkit/themes/winstripe/mozapps/extensions/ratings-aero.png
toolkit/themes/winstripe/mozapps/extensions/themeGeneric-aero.png
toolkit/themes/winstripe/mozapps/extensions/update.css
toolkit/themes/winstripe/mozapps/extensions/viewButtons-aero.png
toolkit/themes/winstripe/mozapps/extensions/viewButtons.png
toolkit/themes/winstripe/mozapps/passwordmgr/key-aero.png
toolkit/themes/winstripe/mozapps/places/defaultFavicon.png
toolkit/themes/winstripe/mozapps/places/tagContainerIcon.png
toolkit/themes/winstripe/mozapps/plugins/pluginGeneric-aero.png
toolkit/themes/winstripe/mozapps/profile/profileicon.png
toolkit/themes/winstripe/mozapps/xpinstall/xpinstallItemGeneric-aero.png
tools/footprint/leak-gauge.html
tools/relic/test/addlicense_inputs/emacs_local_vars_line.c
tools/relic/test/addlicense_outputs/emacs_local_vars_line.c
tools/relic/test/relicense_inputs/need_to_relicense.h
tools/relic/test/relicense_inputs/npl.h
tools/relic/test/relicense_outputs/need_to_relicense.h
tools/relic/test/relicense_outputs/npl.h
uriloader/exthandler/beos/nsMIMEInfoBeOS.cpp
uriloader/exthandler/mac/nsMIMEInfoMac.h
uriloader/exthandler/nsIHandlerService.idl
uriloader/exthandler/os2/nsMIMEInfoOS2.h
uriloader/exthandler/win/nsMIMEInfoWin.h
widget/public/nsIDragSessionOS2.h
xpcom/ds/nsHashPropertyBag.cpp
xpcom/glue/nsVersionComparator.h
xpcom/io/nsAppDirectoryServiceDefs.h
xpcom/io/nsDirectoryServiceDefs.h
xpcom/io/nsUnicharInputStream.h
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_nto_shle.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_shle.s
xpcom/reflect/xptcall/src/md/win32/xptcinvoke_asm_x86_64.asm
xpcom/reflect/xptcall/src/md/win32/xptcstubs_asm_x86_64.asm
xpcom/string/public/nsAlgorithm.h
xulrunner/app/nsRegisterGREWin.cpp