diff options
author | Valerio Virgillito | 2012-04-27 14:26:41 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-27 14:26:41 -0700 |
commit | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (patch) | |
tree | 39fe2ff0cadd444b440310db444c90d9800fb0c1 /js/panels/Timeline/Layer.reel/Layer.html | |
parent | b08cc404d32dd1d4dbc2139ce8f06d7d88b681a8 (diff) | |
download | ninja-c8fac64d4ad8ac18744a17a5e0f0d17204355fd6.tar.gz |
Merge cleanup
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Layer.reel/Layer.html')
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index bec033f8..10334b31 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html | |||
@@ -41,8 +41,7 @@ | |||
41 | } | 41 | } |
42 | }, | 42 | }, |
43 | "dtext2" : { | 43 | "dtext2" : { |
44 | "module" : "montage/ui/dynamic-text.reel", | 44 | "prototype" : "montage/ui/dynamic-text.reel", |
45 | "name" : "DynamicText", | ||
46 | "properties" : { | 45 | "properties" : { |
47 | "element" : {"#" : "layer-tag"} | 46 | "element" : {"#" : "layer-tag"} |
48 | }, | 47 | }, |