diff options
author | Valerio Virgillito | 2012-04-27 14:21:35 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-27 14:21:35 -0700 |
commit | b08cc404d32dd1d4dbc2139ce8f06d7d88b681a8 (patch) | |
tree | ae45391131c7c5203ae8e0d3470d106d835c8c6b /js | |
parent | 314709dd189807bfc762aa150bb1b29d2ccdf25b (diff) | |
parent | 6c1aa27b7753bc9007514859b42160fae265740d (diff) | |
download | ninja-b08cc404d32dd1d4dbc2139ce8f06d7d88b681a8.tar.gz |
Merge branch 'refs/heads/serialization'
Diffstat (limited to 'js')
123 files changed, 663 insertions, 932 deletions
diff --git a/js/components/about-box.reel/about-box.html b/js/components/about-box.reel/about-box.html index 7142d605..1f41699e 100644 --- a/js/components/about-box.reel/about-box.html +++ b/js/components/about-box.reel/about-box.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 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/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
@@ -12,8 +12,7 @@ | |||