diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/panels/Timeline/Track.reel/Track.html | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Track.reel/Track.html')
| -rw-r--r-- | js/panels/Timeline/Track.reel/Track.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/Timeline/Track.reel/Track.html b/js/panels/Timeline/Track.reel/Track.html index 9c72f430..0f0c7c9c 100644 --- a/js/panels/Timeline/Track.reel/Track.html +++ b/js/panels/Timeline/Track.reel/Track.html | |||
| @@ -53,9 +53,9 @@ | |||
| 53 | </head> | 53 | </head> |
| 54 | <body> | 54 | <body> |
| 55 | 55 | ||
| 56 | <div id="track"> | 56 | <div data-montage-id="track"> |
| 57 | <div id="track_lanes"> | 57 | <div data-montage-id="track_lanes"> |
| 58 | <div id="track_lane" class="tracklane"></div> | 58 | <div data-montage-id="track_lane" class="tracklane"></div> |
| 59 | </div> | 59 | </div> |
| 60 | </div> | 60 | </div> |
| 61 | 61 | ||