Merge mozilla-central, including the Electrolysis changes, into the branch for bug 568691.

2010-07-01 11:55:57 -04:00
parent e08e00e83e 502dc859f3
commit c0b20a13c4
435 changed files with 29427 additions and 5558 deletions
--- a/toolkit/library/dlldeps-xul.cpp
+++ b/toolkit/library/dlldeps-xul.cpp
@@ -56,5 +56,6 @@ void xxxNeverCalledXUL()
  XRE_InitParentProcess(0, nsnull, nsnull, nsnull);
  XRE_RunAppShell();
  XRE_ShutdownChildProcess();
+  XRE_SendTestShellCommand(nsnull, nsnull, nsnull);
 #endif
 }