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/components/menu/menu.reel | |
| 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/components/menu/menu.reel')
| -rwxr-xr-x | js/components/menu/menu.reel/menu.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/components/menu/menu.reel/menu.html b/js/components/menu/menu.reel/menu.html index 6c74ac6a..c4a42c0a 100755 --- a/js/components/menu/menu.reel/menu.html +++ b/js/components/menu/menu.reel/menu.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. |
| @@ -72,7 +72,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 72 | "menuIsActive": {"<-": "@owner.active"} | 72 | "menuIsActive": {"<-": "@owner.active"} |
| 73 | } | 73 | } |
| 74 | }, | 74 | }, |
| 75 | 75 | ||
| 76 | "owner": { | 76 | "owner": { |
| 77 | "prototype": "js/components/menu/menu.reel", | 77 | "prototype": "js/components/menu/menu.reel", |
| 78 | "properties": { | 78 | "properties": { |