diff options
| author | Jon Reid | 2012-06-14 14:30:16 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-14 14:30:16 -0700 |
| commit | 0bb16b6a7aa392b9e26eb9787542da9a274c4960 (patch) | |
| tree | 72cf5f580f32c5f21f573c7812a3a387917ab01e /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |
| parent | 0d080d97141cd08855e14a63fa3fee062663cd7d (diff) | |
| parent | 53bb51a38edc6fe7cc80c43d34027590a22a1d32 (diff) | |
| download | ninja-0bb16b6a7aa392b9e26eb9787542da9a274c4960.tar.gz | |
Merge branch 'new-easing-menu' into timeline-local
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 5c957619..73c5ff8d 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
| @@ -37,7 +37,8 @@ | |||
| 37 | "checkable_relative" : {"#" : "checkable_relative"}, | 37 | "checkable_relative" : {"#" : "checkable_relative"}, |
| 38 | "checkable_absolute" : {"#" : "checkable_absolute"}, | 38 | "checkable_absolute" : {"#" : "checkable_absolute"}, |
| 39 | "checkable_animated" : {"#" : "checkable_animated"}, | 39 | "checkable_animated" : {"#" : "checkable_animated"}, |
| 40 | "tl_configbutton" : {"#" : "tl-configbutton"} | 40 | "tl_configbutton" : {"#" : "tl-configbutton"}, |
| 41 | "easingMenu" : {"@" : "easingMenu"} | ||
| 41 | } | 42 | } |
| 42 | }, | 43 | }, |
| 43 | 44 | ||