aboutsummaryrefslogtreecommitdiff
path: root/js/panels/CSSPanel/css-property-name-list.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-31 17:16:21 -0700
committerPushkar Joshi2012-05-31 17:16:21 -0700
commit8915a7109d918a2e69b0999ebaa2deb84811fef8 (patch)
tree19a8af74c58c9ea261f0842f36efdab959be3256 /js/panels/CSSPanel/css-property-name-list.js
parenteea0a556e44c2b60d3aaf6e46d2432d3e6303812 (diff)
parent06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff)
downloadninja-8915a7109d918a2e69b0999ebaa2deb84811fef8.tar.gz
Merge branch 'pentool' into brushtool
Diffstat (limited to 'js/panels/CSSPanel/css-property-name-list.js')
-rwxr-xr-xjs/panels/CSSPanel/css-property-name-list.js2
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
7exports.cssPropertyNameList = [ 7exports.CssPropertyNameList = [
8 '-webkit-', 8 '-webkit-',
9 "-webkit-animation", 9 "-webkit-animation",
10 "-webkit-animation-delay", 10 "-webkit-animation-delay",