diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 11:26:09 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 11:26:09 +0100 |
| commit | 40cc6dea5b1b5d2570468adcc83943f8c8bd112e (patch) | |
| tree | a314707e11905a9f8bab8d6a93d4532194af371a /Source/WebCore/css/CSSValueKeywords.in | |
| parent | 0b30e4490f7500ade1868fb33cea8705418c90bb (diff) | |
| parent | c176f1fbe8ed0d87c507811f4c0e4d67a71bc890 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
.qmake.conf
Change-Id: Id65b546f295897cd386125d2d3d4160051cc7d22
Diffstat (limited to 'Source/WebCore/css/CSSValueKeywords.in')
| -rw-r--r-- | Source/WebCore/css/CSSValueKeywords.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebCore/css/CSSValueKeywords.in b/Source/WebCore/css/CSSValueKeywords.in index 679e736bf..dc7b34c26 100644 --- a/Source/WebCore/css/CSSValueKeywords.in +++ b/Source/WebCore/css/CSSValueKeywords.in @@ -341,7 +341,9 @@ table-cell table-caption -webkit-box -webkit-inline-box +flex -webkit-flex +inline-flex -webkit-inline-flex -webkit-grid -webkit-inline-grid |