diff options
| author | Pushkar Joshi | 2012-03-05 14:35:37 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-05 14:35:37 -0800 |
| commit | c155cd238b6f9e0b8191e0fc533f7bc974b762c2 (patch) | |
| tree | 645c056432ade1d7cfe4ae2f358e068dd883d598 /js/panels/presets/transitions-presets.reel/transitions-presets.html | |
| parent | dc3c813320c8d3fb837d5d18e70ab35a53b116c1 (diff) | |
| parent | 13f52cf0c74f53a919fa864f86669e8155f82961 (diff) | |
| download | ninja-c155cd238b6f9e0b8191e0fc533f7bc974b762c2.tar.gz | |
Merge branch 'master' into pentool
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 | }, |