diff options
author | Jose Antonio Marquez | 2012-02-23 15:11:51 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-23 15:11:51 -0800 |
commit | bdc39718cacad2eab10a7d031ea10fda13c92a03 (patch) | |
tree | 5fa2ae85a15d8a5067fa6f608c2b285869264ead /js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html | |
parent | 23b4bbd13345ecd5c00fda60b995a7fb2aab317c (diff) | |
parent | 41b69af7c0be3dd5fe4f772668862696af8b917a (diff) | |
download | ninja-bdc39718cacad2eab10a7d031ea10fda13c92a03.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
js/controllers/document-controller.js
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html')
-rw-r--r-- | js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html new file mode 100644 index 00000000..7781af11 --- /dev/null +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html | |||
@@ -0,0 +1,24 @@ | |||
1 | <!DOCTYPE html> | ||
2 | <html lang="en"> | ||
3 | <head> | ||
4 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
5 | <link rel="stylesheet" type="text/css" href="css/PropertyTrack.css"> | ||
6 | <script type="text/montage-serialization"> | ||
7 | { | ||
8 | "owner": { | ||
9 | "module": "js/panels/Timeline/PropertyTrack.reel", | ||
10 | "name": "PropertyTrack", | ||
11 | "properties": { | ||
12 | "element": {"#": "property-track"} | ||
13 | } | ||
14 | } | ||
15 | |||
16 | } | ||
17 | </script> | ||
18 | </head> | ||
19 | <body> | ||
20 | |||
21 | <div id="property-track" class="timeline-track"></div> | ||
22 | |||
23 | </body> | ||
24 | </html> \ No newline at end of file | ||