aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
diff options
context:
space:
mode:
authorJonathan Duran2012-03-23 07:26:49 -0700
committerJonathan Duran2012-03-23 07:26:49 -0700
commit4bf42c311178d803012b506ec955ceaa5ef9547b (patch)
treeb9872985467a8f31e3fbbef6b9f7347fa0a6254a /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
parent846d539997bf188b9caf63cdf0008367fe6c9ede (diff)
parent2d9cb9ca8f6beb661a3d904b5125afa8243661de (diff)
downloadninja-4bf42c311178d803012b506ec955ceaa5ef9547b.tar.gz
Merge branch 'refs/heads/Timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 6e7d410c..2e0bf7dd 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -19,7 +19,7 @@
19 "element": {"#": "timeline_panel"}, 19 "element": {"#": "timeline_panel"},
20 "user_layers": {"#": "user_layers"}, 20 "user_layers": {"#": "user_layers"},
21 "track_container": {"#": "right_inside"}, 21 "track_container": {"#": "right_inside"},
22 "timeline_leftpane" : {"#" : "timeline_leftpane"}, 22 "timeline_leftpane" : {"#" : "leftpane_inside"},
23 "layer_tracks": {"#": "layer_tracks"}, 23 "layer_tracks": {"#": "layer_tracks"},
24 "master_track": {"#": "master_track"}, 24 "master_track": {"#": "master_track"},
25 "time_markers" : {"#": "timeline_markers"}, 25 "time_markers" : {"#": "timeline_markers"},