diff options
| author | Ananya Sen | 2012-06-26 16:07:00 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-06-26 16:07:00 -0700 |
| commit | 1d5372534d11c9c1b818ba5e7d67498c731e9ac6 (patch) | |
| tree | bc09c9f08ac2faa955995a91a78337276a81eb77 /js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.css | |
| parent | 3391a8e6fd5df0d464edaffd98c2b3fde23acf5a (diff) | |
| parent | 46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff) | |
| download | ninja-1d5372534d11c9c1b818ba5e7d67498c731e9ac6.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into bugfix-master
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.css')
| -rwxr-xr-x | js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.css | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.css b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.css new file mode 100755 index 00000000..018448f1 --- /dev/null +++ b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.css | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | /* <copyright> | ||
| 2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 5 | </copyright> */ | ||