diff options
| author | hwc487 | 2012-04-19 13:01:43 -0700 |
|---|---|---|
| committer | hwc487 | 2012-04-19 13:01:43 -0700 |
| commit | e6a20fe64574763483dc602bd759278ccf5e5e68 (patch) | |
| tree | 69defe7200206f0257fe90697136fadef59d521e /js/panels/history-panel/history-item.reel/history-item.html | |
| parent | ae7eb87564632ce7c676bd728b8ff2710ff0bb83 (diff) | |
| parent | 9284c19f076dec3b47ece7dc7bcd22d74e4246c3 (diff) | |
| download | ninja-e6a20fe64574763483dc602bd759278ccf5e5e68.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/drawing/world.js
js/lib/geom/geom-obj.js
js/lib/rdge/materials/cloud-material.js
js/lib/rdge/materials/deform-material.js
js/lib/rdge/materials/flat-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/relief-tunnel-material.js
js/lib/rdge/materials/square-tunnel-material.js
js/lib/rdge/materials/star-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/tunnel-material.js
js/lib/rdge/materials/twist-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/uber-material.js
js/lib/rdge/materials/water-material.js
js/lib/rdge/materials/z-invert-material.js
Diffstat (limited to 'js/panels/history-panel/history-item.reel/history-item.html')
| -rw-r--r-- | js/panels/history-panel/history-item.reel/history-item.html | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/js/panels/history-panel/history-item.reel/history-item.html b/js/panels/history-panel/history-item.reel/history-item.html new file mode 100644 index 00000000..2db27846 --- /dev/null +++ b/js/panels/history-panel/history-item.reel/history-item.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="history-item.css"> | ||
| 11 | |||
| 12 | <script type="text/montage-serialization"> | ||
| 13 | { | ||
| 14 | "owner": { | ||
| 15 | "prototype": "js/panels/history-panel/history-item.reel", | ||
| 16 | "properties": { | ||
| 17 | "element": {"#": "history_item"} | ||
| 18 | } | ||
| 19 | } | ||
| 20 | } | ||
| 21 | </script> | ||
| 22 | |||
| 23 | </head> | ||
| 24 | <body> | ||
| 25 | |||
| 26 | <li data-montage-id="history_item"></li> | ||
| 27 | |||
| 28 | </body> | ||
| 29 | </html> \ No newline at end of file | ||