diff options
| author | Jonathan Duran | 2012-05-04 22:32:38 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-04 22:32:38 -0700 |
| commit | 9f71f7804bd649dbfb9078cc0bef562530738e6f (patch) | |
| tree | da5d4aa2f894e840dd044d890e0d0cae6c7c2843 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |
| parent | eaef072648eb539e648aabf7bc1aea8d02c21085 (diff) | |
| parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
| download | ninja-9f71f7804bd649dbfb9078cc0bef562530738e6f.tar.gz | |
Merge branch 'refs/heads/TimelineUber' into TimelineProps
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 19709ca7..8ddc81cd 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | "container_tracks" : {"#" : "container-tracks"}, | 31 | "container_tracks" : {"#" : "container-tracks"}, |
| 32 | "end_hottext" : {"@" : "endHottext"}, | 32 | "end_hottext" : {"@" : "endHottext"}, |
| 33 | "container_layers" : {"#" : "container-layers"}, | 33 | "container_layers" : {"#" : "container-layers"}, |
| 34 | "container_tracks" : {"#" : "container-tracks"}, | ||
| 34 | "timeline_disabler" : {"#" : "timeline-disabler"}, | 35 | "timeline_disabler" : {"#" : "timeline-disabler"}, |
| 35 | "checkable_relative" : {"#" : "checkable_relative"}, | 36 | "checkable_relative" : {"#" : "checkable_relative"}, |
| 36 | "checkable_absolute" : {"#" : "checkable_absolute"}, | 37 | "checkable_absolute" : {"#" : "checkable_absolute"}, |