diff options
| author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
| commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
| tree | c51112223ceb9121cd595a60335eb2795215590f /js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html | |
| parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
| parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
| download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz | |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html')
| -rw-r--r-- | js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html | 29 |
1 files changed, 29 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..01cad6cb --- /dev/null +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | <!DOCTYPE html> | ||
| 2 | <!-- <copyright> | ||
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 6 | </copyright> --> | ||
| 7 | <html lang="en"> | ||
| 8 | <head> | ||
| 9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
| 10 | <link rel="stylesheet" type="text/css" href="css/PropertyTrack.css"> | ||
| 11 | <script type="text/montage-serialization"> | ||
| 12 | { | ||
| 13 | "owner": { | ||
| 14 | "module": "js/panels/Timeline/PropertyTrack.reel", | ||
| 15 | "name": "PropertyTrack", | ||
| 16 | "properties": { | ||
| 17 | "element": {"#": "property-track"} | ||
| 18 | } | ||
| 19 | } | ||
| 20 | |||
| 21 | } | ||
| 22 | </script> | ||
| 23 | </head> | ||
| 24 | <body> | ||
| 25 | |||
| 26 | <div id="property-track" class="timeline-track"></div> | ||
| 27 | |||
| 28 | </body> | ||
| 29 | </html> \ No newline at end of file | ||