Show
Ignore:
Timestamp:
08/18/08 11:14:49 (5 months ago)
Author:
odole
Message:

merge with webkit revision 35814

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/JavaScriptCore/kjs/JSCell.h

    r381 r440  
    9797        virtual bool getOwnPropertySlot(ExecState*, const Identifier& propertyName, PropertySlot&); 
    9898        virtual bool getOwnPropertySlot(ExecState*, unsigned propertyName, PropertySlot&); 
     99         
     100        intptr_t reserved; // Reserved for work in progress. 
    99101    }; 
    100102