diff options
| author | Jonathan Duran | 2012-06-19 08:40:44 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-19 08:40:44 -0700 |
| commit | 53a49f49ce5cd72fbb21e2840bb9622d5952d953 (patch) | |
| tree | f1af9c311e7a72a03e3e521a88410fd75aca05e8 /js/panels/Timeline/EasingMenu.reel/EasingMenu.html | |
| parent | 6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39 (diff) | |
| parent | e600253fa8e6027c4bac7ebb69e0d4ce12a76ff8 (diff) | |
| download | ninja-53a49f49ce5cd72fbb21e2840bb9622d5952d953.tar.gz | |
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/EasingMenu.reel/EasingMenu.html')
| -rw-r--r-- | js/panels/Timeline/EasingMenu.reel/EasingMenu.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/panels/Timeline/EasingMenu.reel/EasingMenu.html b/js/panels/Timeline/EasingMenu.reel/EasingMenu.html index 82218b45..1c8f808f 100644 --- a/js/panels/Timeline/EasingMenu.reel/EasingMenu.html +++ b/js/panels/Timeline/EasingMenu.reel/EasingMenu.html | |||
| @@ -23,8 +23,9 @@ | |||
| 23 | <body> | 23 | <body> |
| 24 | <div data-montage-id="container-easing-menu" class="container-easing-choices"> | 24 | <div data-montage-id="container-easing-menu" class="container-easing-choices"> |
| 25 | <ul data-montage-id="easing_choices" class="easing-choices"> | 25 | <ul data-montage-id="easing_choices" class="easing-choices"> |
| 26 | <li data-ninja-ease="none">none</li> | ||
| 26 | <li data-ninja-ease="ease">ease</li> | 27 | <li data-ninja-ease="ease">ease</li> |
| 27 | <li data-ninja-ease="ease-out" class="easing-selected">ease-out</li> | 28 | <li data-ninja-ease="ease-out">ease-out</li> |
| 28 | <li data-ninja-ease="ease-in">ease-in</li> | 29 | <li data-ninja-ease="ease-in">ease-in</li> |
| 29 | <li data-ninja-ease="ease-in-out">ease-in-out</li> | 30 | <li data-ninja-ease="ease-in-out">ease-in-out</li> |
| 30 | <li data-ninja-ease="linear">linear</li> | 31 | <li data-ninja-ease="linear">linear</li> |