diff options
| author | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
| commit | c21db7f1e4a0582777bdb5366df5d023a915b779 (patch) | |
| tree | c4d29cb4686101d4a480ae836d20187879cf5400 /js/panels/CSSPanel/css-property-name-list.js | |
| parent | 3ed95247e9ea4b0a7833401ed6809647b7c4acbf (diff) | |
| parent | 1a7e347810401e6262d9d7bad1c3583e6773993b (diff) | |
| download | ninja-c21db7f1e4a0582777bdb5366df5d023a915b779.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/data/panels-data.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/CSSPanel/css-property-name-list.js')
| -rwxr-xr-x | js/panels/CSSPanel/css-property-name-list.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/CSSPanel/css-property-name-list.js b/js/panels/CSSPanel/css-property-name-list.js index 24a69c09..6d02b755 100755 --- a/js/panels/CSSPanel/css-property-name-list.js +++ b/js/panels/CSSPanel/css-property-name-list.js | |||
| @@ -4,7 +4,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
| 5 | </copyright> */ | 5 | </copyright> */ |
| 6 | 6 | ||
| 7 | exports.cssPropertyNameList = [ | 7 | exports.CssPropertyNameList = [ |
| 8 | '-webkit-', | 8 | '-webkit-', |
| 9 | "-webkit-animation", | 9 | "-webkit-animation", |
| 10 | "-webkit-animation-delay", | 10 | "-webkit-animation-delay", |