aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/default-animation-presets.js
Commit message (Collapse)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-04
|\ | | | | | | | | | | | | | | | | 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
| * Presets - Remove style transition when transition doesn't start. Also added ↵Eric Guzman2012-03-29
| | | | | | | | temporary fix for aggregating animations (from timeline/presets)
* | merge from mainhwc4872012-03-29
|/
* Merge branch 'refs/heads/master' into PresetsPIEric Guzman2012-03-27
|\
| * Presets - fixed preset group name ("2D")Eric Guzman2012-03-23
| |
| * Presets Panel - Add slide/fade out animationEric Guzman2012-03-23
| |
| * Presets - Animation updateEric Guzman2012-03-20
| |
* | Presets Panel - Adding presets controller and removing functionality from ↵Eric Guzman2012-03-22
|/ | | | panel code
* Presets Panel - Adding Animations TabEric Guzman2012-03-16