diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/panels/Timeline/Track.reel/Track.html | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
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 | ||