summaryrefslogtreecommitdiffstats
path: root/Source/JavaScriptCore
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r82507: Fix makefilesSteve Block2011-06-081-0/+1
| | | | Change-Id: Ia541ed77797442b5894b6fb88b3b829cc59c3535
* Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-08290-3107/+14905
| | | | Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
* Merge WebKit at r80534: Update uses of PLATFORM(SKIA).Ben Murdoch2011-06-021-1/+1
| | | | | | | | | PLATFORM(SKIA) is replaced with USE(SKIA), see http://trac.webkit.org/changeset/79578 Fix conflicts and update our code to reflect this. Change-Id: Ia23956874418552eb8f107d389557a4cdcb225b6
* Merge WebKit at r80534: Fix makefiles.Ben Murdoch2011-06-022-1/+10
| | | | | | | | | | | | | Add new and remove deleted files to fix makefiles. See http://trac.webkit.org/changeset/79861 for new XSLTreeViewer generation. Also remove a stub from TemporaryLInkStubs that we now get by compiling the correct files in JSC (see http://trac.webkit.org/changeset/78634). Change-Id: I550b035b7c9c915b42738366da7817dca020c9a8
* Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-02271-27306/+32481
| | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guardSteve Block2011-05-251-7/+1
| | | | | | | | | | | | | This replaces, and therefore conflicts with, Android's existing ENABLE_ARCHIVE guard. This change resolves the conflicts by taking the upstream guard in WebCore, updates WebKit to use the new guard, and enables this guard on Android. See http://trac.webkit.org/changeset/78439 See also http://trac.webkit.org/changeset/78342 for FrameLoader.cpp Change-Id: I28ebaf3d69ea4c352ab4cfbf91c33a8ba25f89b5
* Merge WebKit at r78450: Fix MakefilesSteve Block2011-05-242-33/+12
| | | | | | PCRE switched for YARR - http://trac.webkit.org/changeset/78042 Change-Id: Ie5090e0d7a174e3c2975b807d0b4769b15494156
* Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-24216-11989/+7909
| | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-23112-459/+1358
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* Fix some compiler warningsSteve Block2011-05-191-1/+1
| | | | Change-Id: I4c5fde4898313b26c9a97bd9571b02eaeb35c684
* Merge WebKit at r75993: Fix MakefilesBen Murdoch2011-05-161-7/+1
| | | | Change-Id: I81db2c8ade83fcaf85db13629a12b7e0d2e6dccc
* Merge WebKit at r75993: Initial merge by git.Ben Murdoch2011-05-1685-1895/+4063
| | | | Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
* Merge WebKit at r75315: Fix MakefilesSteve Block2011-05-131-6/+2
| | | | | | See http://trac.webkit.org/changeset/74646 Change-Id: Ib0ef9902925ddb13ec97fad0753515b10b1d3c01
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-121928-0/+535558
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
generated by cgit v1.1 at 2024-07-01 06:01:15 +0000