diff options
| author | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
| commit | 65b989c7759af923fb9456d34bff89f91831ea1e (patch) | |
| tree | e408be732a3eee71229bfc7dbf7cace998ce18de /node_modules/montage/ui/list.reel/list.html | |
| parent | 38f571d1fdf02d36c3816637af7b2ca2493809da (diff) | |
| parent | fc818d31de267d2b77fda3b3029ad38d48698be8 (diff) | |
| download | ninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
node_modules/montage/ui/application.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/list.reel/list.html')
| -rwxr-xr-x | node_modules/montage/ui/list.reel/list.html | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/node_modules/montage/ui/list.reel/list.html b/node_modules/montage/ui/list.reel/list.html index f0d648c0..e5166a23 100755 --- a/node_modules/montage/ui/list.reel/list.html +++ b/node_modules/montage/ui/list.reel/list.html | |||
| @@ -5,10 +5,10 @@ | |||
| 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
| 6 | </copyright> --> | 6 | </copyright> --> |
| 7 | <html> | 7 | <html> |
| 8 | <head> | 8 | <head> |
| 9 | <title></title> | 9 | <meta charset="utf-8"> |
| 10 | <script type="text/montage-serialization">{ | 10 | <script type="text/montage-serialization"> |
| 11 | 11 | { | |
| 12 | "repetition1": { | 12 | "repetition1": { |
| 13 | "prototype": "ui/repetition.reel", | 13 | "prototype": "ui/repetition.reel", |
| 14 | "properties": { | 14 | "properties": { |
| @@ -45,9 +45,8 @@ | |||
| 45 | } | 45 | } |
| 46 | } | 46 | } |
| 47 | } | 47 | } |
| 48 | 48 | } | |
| 49 | }</script> | 49 | </script> |
| 50 | |||
| 51 | </head> | 50 | </head> |
| 52 | <body> | 51 | <body> |
| 53 | <div data-montage-id="EA5D3E95-BA4E-4696-BBBE-B4DE2F6ED6C9"> | 52 | <div data-montage-id="EA5D3E95-BA4E-4696-BBBE-B4DE2F6ED6C9"> |