Merge TM -> JM

2011-04-20 11:37:46 -07:00
parent 88befb317a e142814c13
commit b833226820
33 changed files with 1081 additions and 691 deletions
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -97,6 +97,7 @@
 #include "jsversion.h"
 #include "jsfun.h"
 #include "jsgc.h"
+#include "jsgcmark.h"
 #include "jsinterp.h"
 #include "jsiter.h"
 #include "jslock.h"