diff options
| author | Pushkar Joshi | 2012-03-05 14:49:05 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-05 14:49:05 -0800 |
| commit | db82be91f767a07b7cb8c97ca3d9f4c4d75bc9ae (patch) | |
| tree | 21e0ee213e24de67eb9c4cddfc5f3069c2257aae /js/panels/presets/transitions-presets.reel/transitions-presets.html | |
| parent | 4419209a1fd850ab468209b562b66b0242b42a9c (diff) | |
| parent | 13f52cf0c74f53a919fa864f86669e8155f82961 (diff) | |
| download | ninja-db82be91f767a07b7cb8c97ca3d9f4c4d75bc9ae.tar.gz | |
Merge branch 'master' into brushtool
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 | }, |