summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore/runtime/Operations.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-081-5/+5
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-251-6/+42
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-271-57/+92
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Merge webkit.org at r54731 : Initial merge by gitSteve Block2010-02-161-1/+1
| | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
* Merge webkit.org at r54127 : Take theirs for changes to JavaScript string ↵Steve Block2010-02-041-27/+41
| | | | | | | | | | | addition. The conflict is due to the fact that we cherry-picked a WebKit change http://trac.webkit.org/changeset/51978 to fix a bug. This change updates all files touched by this change to match webkit.org. See https://android-git.corp.google.com/g/#change,36411 Change-Id: Ie17c59467b74f3bf3be1149bebe086b92b30afc4
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-3/+54
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Cherry-picks a WebKit change to revert recent changes to String addition for ↵Steve Block2010-01-041-47/+22
| | | | | | | | | | | | | | | | | JSC. WebKit change http://trac.webkit.org/changeset/51975 modified String addition in JSC to use ropes. However, the change was incorrect, so was rolled back in http://trac.webkit.org/changeset/51978. The last WebKit merge was to revision r51976, so picked up the initial, broken change only. This change cherry-picks http://trac.webkit.org/changeset/51978 to revert the original change. Bug: 2336856 Change-Id: I7f48bce6a7f605779424ba0a7601524ab3a71990
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-78/+110
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-101-4/+23
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-10/+3
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Merge in WebKit r47029.Ben Murdoch2009-08-111-18/+16
|
* Get WebKit r44544.Feng Qian2009-06-171-34/+86
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-3/+150
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-0/+135
generated by cgit v1.1 at 2025-06-02 11:36:21 +0000