Start fixing merge trainwreck, no bug.

2011-11-14 13:03:50 -08:00
parent ae4638c3cf
commit a0a681a848
22 changed files with 156 additions and 111 deletions
--- a/js/src/gc/Statistics.cpp
+++ b/js/src/gc/Statistics.cpp
@@ -44,14 +44,10 @@
 #include "jscrashreport.h"
 #include "jsprf.h"
 #include "jsprobes.h"
-#include "jsscope.h"
 #include "jsutil.h"
 #include "prmjtime.h"

 #include "gc/Statistics.h"
-#include "vm/GlobalObject.h"
-
-#include "jsobjinlines.h"

 namespace js {
 namespace gcstats {