Merge mozilla-central to tracemonkey.
commit1f59ffd5ca1e175d70366f50cb87465dd73e0c1e
authorChris Leary <cdleary@mozilla.com>
Thu, 30 Dec 2010 00:25:04 +0000 (29 19:25 -0500)
committerChris Leary <cdleary@mozilla.com>
Thu, 30 Dec 2010 00:25:04 +0000 (29 19:25 -0500)
tree346ec3591876ad92e8efded7b45f98298e360c27
parent7105821a7bb5ae639ff050255c90606e9c01a9d6
parente8cdcc836101db006208009b7691d9ada57b62b2
Merge mozilla-central to tracemonkey.
45 files changed:
browser/themes/gnomestripe/browser/effects.svg
browser/themes/pinstripe/browser/effects.svg
browser/themes/winstripe/browser/effects.svg
build/bloaturls.txt
caps/src/nsScriptSecurityManager.cpp
content/base/src/nsWebSocket.cpp
content/xslt/src/xslt/txMozillaXSLTProcessor.cpp
dom/base/nsDOMClassInfo.cpp
dom/base/nsDOMClassInfo.h
dom/base/nsJSEnvironment.cpp
dom/base/nsJSUtils.h
dom/indexedDB/IDBCursor.cpp
dom/indexedDB/IDBDatabase.cpp
dom/indexedDB/IDBObjectStore.cpp
dom/indexedDB/IDBObjectStore.h
dom/src/threads/nsDOMWorker.cpp
extensions/jssh/ChangeLog
extensions/jssh/Makefile.in
extensions/jssh/install.js
extensions/jssh/jar.mn
extensions/jssh/nsIJSShServer.idl
extensions/jssh/nsJSSh.cpp
extensions/jssh/nsJSSh.h
extensions/jssh/nsJSShServer.cpp
extensions/jssh/nsJSShStarter.js
extensions/jssh/resources/content/configure.xul
extensions/jssh/resources/content/contents.rdf
extensions/jssh/resources/content/jssh-debug.js
extensions/jssh/resources/content/tasksOverlay.xul
extensions/jssh/xemacs/moz-jssh.el
js/src/jsapi.cpp
js/src/jsapi.h
js/src/jscntxt.h
js/src/jsnum.cpp
js/src/jsobj.cpp
js/src/jsobj.h
js/src/jsregexp.h
js/src/jsregexpinlines.h
js/src/jsscope.h
js/src/jsstr.cpp
js/src/xpconnect/src/qsgen.py
js/src/xpconnect/src/xpccomponents.cpp
js/src/xpconnect/src/xpcconvert.cpp
js/src/xpconnect/src/xpcwrappedjsclass.cpp
toolkit/xre/Makefile.in