diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/history-panel/history-item.reel/history-item.html | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.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 | 12 |
1 files changed, 6 insertions, 6 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 index f6a4e68f..c9d1b276 100644 --- a/js/panels/history-panel/history-item.reel/history-item.html +++ b/js/panels/history-panel/history-item.reel/history-item.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!doctype html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
| @@ -29,9 +29,9 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
| 29 | POSSIBILITY OF SUCH DAMAGE. | 29 | POSSIBILITY OF SUCH DAMAGE. |
| 30 | </copyright> --> | 30 | </copyright> --> |
| 31 | <html lang="en"> | 31 | <html lang="en"> |
| 32 | <head> | 32 | <head> |
| 33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | 33 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
| 34 | <link rel="stylesheet" type="text/css" href="history-item.css"> | 34 | <link rel="stylesheet" type="text/css" href="history-item.css"> |
| 35 | 35 | ||
| 36 | <script type="text/montage-serialization"> | 36 | <script type="text/montage-serialization"> |
| 37 | { | 37 | { |
| @@ -44,8 +44,8 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 44 | } | 44 | } |
| 45 | </script> | 45 | </script> |
| 46 | 46 | ||
| 47 | </head> | 47 | </head> |
| 48 | <body> | 48 | <body> |
| 49 | 49 | ||
| 50 | <li data-montage-id="history_item"></li> | 50 | <li data-montage-id="history_item"></li> |
| 51 | 51 | ||