aboutsummaryrefslogtreecommitdiff
path: root/js/data/pi
diff options
context:
space:
mode:
authorKruti Shah2012-05-31 10:44:45 -0700
committerKruti Shah2012-05-31 10:44:45 -0700
commitc350cc1c060fdf17357ddadce024267943784593 (patch)
tree453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/data/pi
parentfdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff)
parent121d0e616f48aa7cd048763554089c20a1883d7a (diff)
downloadninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/data/pi')
-rwxr-xr-xjs/data/pi/pi-data.js18
1 files changed, 2 insertions, 16 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index d1dc9f34..157cbc64 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -14,25 +14,11 @@ exports.PiData = Montage.create( Montage, {
14 { 14 {
15 label: "Style", 15 label: "Style",
16 16
17 Section: [
18 [
19
20 ]
21 ]
22 }
23 ]
24 },
25
26 stagePi: {
27 value: [
28 {
29 label: "Style",
30
31 Section: [ 17 Section: [
32 [ 18 [
33 { 19 {
34 type : "chip", 20 type: "chip",
35 id : "background", 21 id: "background",
36 prop: "background" 22 prop: "background"
37 } 23 }
38 ] 24 ]