aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorJonathan Duran2012-04-13 09:51:09 -0700
committerJonathan Duran2012-04-13 09:51:09 -0700
commita6ba1c1621779866b2702aea11b6aeab4bfb466a (patch)
treecb50b3a7bc464edfe36c96dbd21367ca7ff9ecd7 /js/data
parentb5f5ea6bc209ada7f41dd9ebbda807c5a14bd2d7 (diff)
parent4b900ea5cd6bb77eb30cec8c03b9ec9fa662c1e9 (diff)
downloadninja-a6ba1c1621779866b2702aea11b6aeab4bfb466a.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/data')
-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,