diff options
| author | hwc487 | 2012-02-23 15:21:56 -0800 |
|---|---|---|
| committer | hwc487 | 2012-02-23 15:21:56 -0800 |
| commit | 26bb2894c29d4608e843de01829d352dd3d00823 (patch) | |
| tree | c5a9d10976304fe5b3dec59f40977d8c72df57de /js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html | |
| parent | 64280907f31e6f6e5659acb0893df3e0da5bb044 (diff) | |
| parent | 81ce79819ba574b03b46e91e9a153dab82b550cd (diff) | |
| download | ninja-26bb2894c29d4608e843de01829d352dd3d00823.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts:
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/Materials/PulseMaterial.js
js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
js/helper-classes/RDGE/src/tools/rdge-compiled.js
js/preloader/Preloader.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 | ||