diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/css/CSSPropertyNames.in | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/css/CSSPropertyNames.in')
| -rw-r--r-- | Source/WebCore/css/CSSPropertyNames.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/WebCore/css/CSSPropertyNames.in b/Source/WebCore/css/CSSPropertyNames.in index b04c6d6..d1fdcd3 100644 --- a/Source/WebCore/css/CSSPropertyNames.in +++ b/Source/WebCore/css/CSSPropertyNames.in @@ -227,10 +227,12 @@ z-index -webkit-font-size-delta -webkit-highlight -webkit-hyphenate-character --webkit-hyphenate-locale +-webkit-hyphenate-limit-after +-webkit-hyphenate-limit-before -webkit-hyphens -webkit-line-break -webkit-line-clamp +-webkit-locale -webkit-logical-width -webkit-logical-height -webkit-margin-after-collapse |