diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:16:40 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:56 +0000 |
| commit | dba6dad689f23b0ae432573363cdce7d6c027059 (patch) | |
| tree | 98efbdd20b4d76aa5a13e13ff2d5a587f1c9789e /JavaScriptCore | |
| parent | 20d7c166a40520f17c44794037344bf8a31c27d1 (diff) | |
| download | external_webkit-dba6dad689f23b0ae432573363cdce7d6c027059.zip external_webkit-dba6dad689f23b0ae432573363cdce7d6c027059.tar.gz external_webkit-dba6dad689f23b0ae432573363cdce7d6c027059.tar.bz2 | |
Merge webkit.org at r54127 : Take theirs for ChangeLogs and build files for other platforms.
Change-Id: Ie4d7a2183c45d7dbfe2e49692ac573eea243360e
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/ChangeLog | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog index 01ba8ea..3f64567 100644 --- a/JavaScriptCore/ChangeLog +++ b/JavaScriptCore/ChangeLog @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= 2010-01-31 Patrick Gansterer <paroga@paroga.com> Reviewed by Darin Adler. @@ -3740,7 +3738,6 @@ The very last cell in the block is not allocated -- should not be marked. (WTF::timeClip): Use maxECMAScriptTime. (JSC::gregorianDateTimeToMS): Follow the dateToDaysFrom1970() change. ->>>>>>> webkit.org at r54127 2009-12-10 Adam Barth <abarth@webkit.org> No review, rolling out r51975. |