aboutsummaryrefslogtreecommitdiff
path: root/js/data/pi
diff options
context:
space:
mode:
authorJon Reid2012-04-13 10:41:01 -0700
committerJon Reid2012-04-13 10:41:01 -0700
commit29ce0d26e543924d670583ed7d33313164d2f0ff (patch)
tree0c081a1ddd7a5be2c2a602acc1ec1146ed85d442 /js/data/pi
parentdfe348652aa5a54b25dbe0d8249bc289efb31e21 (diff)
parenta6ba1c1621779866b2702aea11b6aeab4bfb466a (diff)
downloadninja-29ce0d26e543924d670583ed7d33313164d2f0ff.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/data/pi')
-rwxr-xr-xjs/data/pi/pi-data.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 07017f09..157c54ec 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -131,6 +131,8 @@ exports.PiData = Montage.create( Montage, {
131 type : "hottext", 131 type : "hottext",
132 id : "borderWidth", 132 id : "borderWidth",
133 prop : "border-width", 133 prop : "border-width",
134 defaultValue: 0,
135 valueMutator: parseFloat,
134 label : "Border", 136 label : "Border",
135 min : 0, 137 min : 0,
136 max : 100, 138 max : 100,