aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/animations-presets.reel/animations-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
| * Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| | | | | | | | | | | | | | | | | | Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | merge from mainhwc4872012-03-29
|/
* Presets Panel - Adding presets controller and removing functionality from ↵Eric Guzman2012-03-22
| | | | panel code
* Presets Panel - Adding Animations TabEric Guzman2012-03-16