diff options
| author | hwc487 | 2012-04-04 16:32:53 -0700 |
|---|---|---|
| committer | hwc487 | 2012-04-04 16:32:53 -0700 |
| commit | 6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600 (patch) | |
| tree | f267e05f623ed90d1cc841b8c79a338d6d8e807c /js/panels/presets/animations-presets.reel | |
| parent | 16f62ca09cc428043e8fef8bdeea11a989e62bc0 (diff) | |
| parent | 17ca01f54591187f5c0812c0fd2cb7260afa9639 (diff) | |
| download | ninja-6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping
Conflicts:
js/panels/presets/animations-presets.reel/animations-presets.js
js/panels/presets/style-presets.reel/style-presets.js
js/panels/presets/transitions-presets.reel/transitions-presets.js
Diffstat (limited to 'js/panels/presets/animations-presets.reel')
| -rw-r--r-- | js/panels/presets/animations-presets.reel/animations-presets.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.js b/js/panels/presets/animations-presets.reel/animations-presets.js index ab200212..272f6c5b 100644 --- a/js/panels/presets/animations-presets.reel/animations-presets.js +++ b/js/panels/presets/animations-presets.reel/animations-presets.js | |||
| @@ -68,6 +68,6 @@ exports.AnimationsLibrary = Montage.create(Component, { | |||
| 68 | }); | 68 | }); |
| 69 | 69 | ||
| 70 | return keysString; | 70 | return keysString; |
| 71 | } | 71 | } |
| 72 | } | 72 | } |
| 73 | }); | 73 | }); |