diff options
author | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-11 14:13:07 -0700 |
commit | 1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2 (patch) | |
tree | 2563aa7694c3caaf813ca71ef3250b2a76ee0041 /js/data | |
parent | 32257ac142f872d3c1f6c07504bae77ae884ed93 (diff) | |
parent | 6fcaa4e923a19672b5860b4c6f67d836680e7e99 (diff) | |
download | ninja-1e2138fc7d0007b0ad3cb4807dc1c9101190f2f2.tar.gz |
Merge branch 'refs/heads/TimelineUber' into TimelineProps
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 | ||