diff options
| author | Jonathan Duran | 2012-03-06 17:08:55 -0800 |
|---|---|---|
| committer | Jonathan Duran | 2012-03-06 17:08:55 -0800 |
| commit | bb6a1d82b2884b410f5859cc0c2cafd380acbe6a (patch) | |
| tree | 6ec3e960a0c38ce8fd88c9bc17f5227d072ebe76 /js/panels/presets/transitions-presets.reel | |
| parent | 2815adfd7c19b3dff89dc3e1bda9af8d30dca8d6 (diff) | |
| parent | 2e3943a8f751ec572066f168b58464c24b9f29e5 (diff) | |
| download | ninja-bb6a1d82b2884b410f5859cc0c2cafd380acbe6a.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/panels/presets/transitions-presets.reel')
| -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 | }, |