external_webkit.git - external/webkit

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard	Steve Block	2011-05-25	1	-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: Initial merge by git.	Steve Block	2011-05-24	40	-355/+988
\| \| \| \|	Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
*	Merge WebKit at r76408: Initial merge by git.	Ben Murdoch	2011-05-23	33	-86/+118
\| \| \| \|	Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
*	Fix some compiler warnings	Steve Block	2011-05-19	1	-1/+1
\| \| \| \|	Change-Id: I4c5fde4898313b26c9a97bd9571b02eaeb35c684
*	Merge WebKit at r75993: Initial merge by git.	Ben Murdoch	2011-05-16	6	-104/+192
\| \| \| \|	Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
*	Merge WebKit at r75315: Initial merge by git.	Steve Block	2011-05-12	202	-0/+42696
	Change-Id: I570314b346ce101c935ed22a626b48c2af266b84