Merge mozilla-central

2010-04-16 01:34:35 -05:00
parent f28bd68d93 f49198f6e9
commit 67b02de57a
812 changed files with 21080 additions and 10546 deletions
--- a/content/base/src/nsFrameLoader.cpp
+++ b/content/base/src/nsFrameLoader.cpp
@@ -59,7 +59,6 @@
 #include "nsIDOMHTMLIFrameElement.h"
 #include "nsIDOMHTMLFrameElement.h"
 #include "nsIDOMWindow.h"
-#include "nsPresContext.h"
 #include "nsIPresShell.h"
 #include "nsIContent.h"
 #include "nsIContentViewer.h"