Merge mozilla-central to tracemonkey.
commit24e6760eea0c08212bfa3e9083463140505ada5c
authorChris Leary <cdleary@mozilla.com>
Thu, 30 Dec 2010 05:36:53 +0000 (30 00:36 -0500)
committerChris Leary <cdleary@mozilla.com>
Thu, 30 Dec 2010 05:36:53 +0000 (30 00:36 -0500)
tree99f5da14984f24b55d6f98e82c5a79f83ec7cf90
parentd667c1b0e2ef86fe9056ea5f5392f55b24271dec
parent898722970bd1fd2778b6f793f06bf5ee3d9933a0
Merge mozilla-central to tracemonkey.
js/src/jsobj.cpp
js/src/jsobj.h
js/src/jsscope.h