diff options
author | Pushkar Joshi | 2012-05-07 11:00:22 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-05-07 11:00:22 -0700 |
commit | e5ae6e0b6e54db0e6efd75d1f14cb791060ed67a (patch) | |
tree | e84d2dc5033c1b5c1b993662660a90af12584b69 /js/data | |
parent | ba890518b5a35d5e6893f9fc72d2eee30ae07e17 (diff) | |
parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
download | ninja-e5ae6e0b6e54db0e6efd75d1f14cb791060ed67a.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/data')
-rwxr-xr-x | js/data/pi/pi-data.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 65161b4f..d1dc9f34 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js | |||
@@ -100,7 +100,7 @@ exports.PiData = Montage.create( Montage, { | |||
100 | } | 100 | } |
101 | ] | 101 | ] |
102 | }, | 102 | }, |
103 | imagePi: { | 103 | imgPi: { |
104 | value: [ | 104 | value: [ |
105 | { | 105 | { |
106 | label: "Image Properties", | 106 | label: "Image Properties", |
@@ -807,8 +807,8 @@ exports.PiData = Montage.create( Montage, { | |||
807 | ] | 807 | ] |
808 | ] | 808 | ] |
809 | } | 809 | } |
810 | ] //value: [ | 810 | ] |
811 | } //BrushStrokePi: { | 811 | } |
812 | }); | 812 | }); |
813 | 813 | ||
814 | 814 | ||