Why wasn't this hunk in the .rej file, or else merged properly?

This commit is contained in:
Brendan Eich 2008-08-26 21:05:17 -07:00
parent ff1b59a197
commit a596a75f05

View File

@ -4056,6 +4056,9 @@ js_math_random(JSContext* cx, uintN argc, jsval* vp);
JSBool
js_math_floor(JSContext* cx, uintN argc, jsval* vp);
JSBool
js_num_toString(JSContext *cx, uintN argc, jsval *vp);
bool
TraceRecorder::record_JSOP_CALL()
{