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/transitions-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/transitions-presets.reel')
| -rw-r--r-- | js/panels/presets/transitions-presets.reel/transitions-presets.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.js b/js/panels/presets/transitions-presets.reel/transitions-presets.js index f7d84085..05f917c4 100644 --- a/js/panels/presets/transitions-presets.reel/transitions-presets.js +++ b/js/panels/presets/transitions-presets.reel/transitions-presets.js | |||
| @@ -41,6 +41,6 @@ exports.TransitionsLibrary = Montage.create(Component, { | |||
| 41 | el._element.classList.add(selectorBase); | 41 | el._element.classList.add(selectorBase); |
| 42 | }, this); | 42 | }, this); |
| 43 | 43 | ||
| 44 | } | 44 | } |
| 45 | } | 45 | } |
| 46 | }); | 46 | }); |