diff options
| author | Jon Reid | 2012-03-06 14:14:01 -0800 |
|---|---|---|
| committer | Jon Reid | 2012-03-06 14:14:01 -0800 |
| commit | 60bba95eaffa8b5c741c6c85fb84b327cd75d6c3 (patch) | |
| tree | 0087ad093418638ff1d0b4362715bd7b2d147eba /js/panels/presets/transitions-presets.reel/transitions-presets.html | |
| parent | d64f8c9fc1dd5fb15ad78ad61bed1ef3736321bb (diff) | |
| parent | 342fb451bd251358068a0dcb10e9dc218b79a176 (diff) | |
| download | ninja-60bba95eaffa8b5c741c6c85fb84b327cd75d6c3.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uber
Diffstat (limited to 'js/panels/presets/transitions-presets.reel/transitions-presets.html')
| -rw-r--r-- | js/panels/presets/transitions-presets.reel/transitions-presets.html | 1 |
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 | }, |