diff options
author | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
commit | 01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch) | |
tree | ceb527713554f506c537168e36a10452cd09ad10 /js/data/pi/pi-data.js | |
parent | b9262c831952e77135b79c2de7c455d5e7ff0589 (diff) | |
parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
download | ninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/data/pi/pi-data.js')
-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 | ||