diff options
author | Nivesh Rajbhandari | 2012-04-04 16:47:51 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-04 16:47:51 -0700 |
commit | 13368ca6ebbc13adeafccd898dfffd7ce37cb28a (patch) | |
tree | fb45f74ede82a32d686a38e71f2c42c5d2ff9370 /js/data/pi | |
parent | 488afcf1604df3d611eca5253d57cc5a79ed80c3 (diff) | |
parent | 8b60a68f0152c609ad94a931472680f313678d8d (diff) | |
download | ninja-13368ca6ebbc13adeafccd898dfffd7ce37cb28a.tar.gz |
Merge branch 'refs/heads/WebGLFileIO' into ToolFixes
Conflicts:
assets/canvas-runtime.js
js/controllers/elements/shapes-controller.js
js/lib/drawing/world.js
js/lib/geom/geom-obj.js
js/lib/geom/line.js
js/mediators/element-mediator.js
js/panels/presets/animations-presets.reel/animations-presets.js
js/panels/presets/style-presets.reel/style-presets.js
js/panels/presets/transitions-presets.reel/transitions-presets.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/data/pi')
-rwxr-xr-x | js/data/pi/pi-data.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 7edc90d8..07017f09 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js | |||
@@ -578,7 +578,7 @@ exports.PiData = Montage.create( Montage, { | |||
578 | valueMutator: parseFloat, | 578 | valueMutator: parseFloat, |
579 | value : 0, | 579 | value : 0, |
580 | min : 0, | 580 | min : 0, |
581 | max : 100, | 581 | max : 99, |
582 | unit : "%", | 582 | unit : "%", |
583 | acceptableUnits: ["%"] | 583 | acceptableUnits: ["%"] |
584 | 584 | ||