diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-08 12:18:00 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-09-11 12:08:58 +0100 |
| commit | 5ddde30071f639962dd557c453f2ad01f8f0fd00 (patch) | |
| tree | 775803c4ab35af50aa5f5472cd1fb95fe9d5152d /WebCore/Android.derived.mk | |
| parent | 3e63d9b33b753ca86d0765d1b3d711114ba9e34f (diff) | |
| download | external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.zip external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.gz external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.bz2 | |
Merge WebKit at r66666 : Initial merge by git.
Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
Diffstat (limited to 'WebCore/Android.derived.mk')
| -rw-r--r-- | WebCore/Android.derived.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk index 8fb10b6..de36334 100644 --- a/WebCore/Android.derived.mk +++ b/WebCore/Android.derived.mk @@ -67,6 +67,7 @@ $(GEN): $(LOCAL_PATH)/html/DocTypeStrings.gperf $(intermediates)/html/HTMLDocument.o : $(GEN) +<<<<<<< HEAD # HTML entity table GEN := $(intermediates)/html/HTMLEntityTable.cpp @@ -82,6 +83,8 @@ $(GEN): $(LOCAL_PATH)/html/HTMLEntityNames.json LOCAL_GENERATED_SOURCES += $(GEN) +======= +>>>>>>> webkit.org at r66666 # color names GEN := $(intermediates)/platform/ColorData.cpp |