aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/transitions-presets.reel
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-02 15:35:27 -0800
committerNivesh Rajbhandari2012-03-02 15:35:27 -0800
commit5f9b67be3b8bdb391d021103c6bcee6be2f6cdf4 (patch)
tree090b724123be441ce379e6c0f0bc12540fee0d5c /js/panels/presets/transitions-presets.reel
parentcc772ef3333ed419d269a2bda7aea5b0150a7bd9 (diff)
parent0aeb400070762cf01d83cf9f9ee25a5595098b7f (diff)
downloadninja-5f9b67be3b8bdb391d021103c6bcee6be2f6cdf4.tar.gz
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'js/panels/presets/transitions-presets.reel')
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.html1
1 files changed, 1 insertions, 0 deletions
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.html b/js/panels/presets/transitions-presets.reel/transitions-presets.html
index c22ed351..5dc28edf 100644
--- a/js/panels/presets/transitions-presets.reel/transitions-presets.html
+++ b/js/panels/presets/transitions-presets.reel/transitions-presets.html
@@ -40,6 +40,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
40 "element" : {"#": "libraryContainer"}, 40 "element" : {"#": "libraryContainer"},
41 "branchComponent" : {"@": "branch" }, 41 "branchComponent" : {"@": "branch" },
42 "contentController": {"@": "presetsController"}, 42 "contentController": {"@": "presetsController"},
43 "activationEvent" : "dblclick",
43 "showRoot": false 44 "showRoot": false
44 } 45 }
45 }, 46 },