OSDN Git Service

resolved conflicts for merge of df644d06 to master
authorSteve Block <steveblock@google.com>
Tue, 19 Jan 2010 15:00:28 +0000 (15:00 +0000)
committerSteve Block <steveblock@google.com>
Tue, 19 Jan 2010 15:00:48 +0000 (15:00 +0000)
commit23a4578154c0507a6c2a42de452b3bcec971d0ed
treefcc8e9db51e01a45cefa674f9b366b3819f63b8e
parent6f473cc5d35ac6beed6d8c4bafdb37a0639ee08e
parentdf644d06988b2a2839113b5f4fc7b8dd1717d964
resolved conflicts for merge of df644d06 to master

Change-Id: I02d6b5e94724091decfe0c26317554c86dcfb2da
WebCore/ChangeLog
WebCore/GNUmakefile.am
WebCore/WebCore.xcodeproj/project.pbxproj
WebKit/android/jni/WebCoreFrameBridge.cpp