Merge WebKit at r71558: Initial merge by git.

[android-x86/external-webkit.git] / WebCore / css / CSSValueKeywords.in

diff --git a/WebCore/css/CSSValueKeywords.in b/WebCore/css/CSSValueKeywords.in
index fa0a214..cd37519 100644 (file)
--- a/WebCore/css/CSSValueKeywords.in
+++ b/WebCore/css/CSSValueKeywords.in
@@ -764,3 +764,7 @@ horizontal-tb
 vertical-rl
 vertical-lr
 horizontal-bt
+
+# -webkit-text-combine
+cluster
+upright