diff options
| author | hwc487 | 2012-07-11 10:20:22 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-11 10:20:22 -0700 |
| commit | 325cf1dcbd7fc1e1ec6a9ac4829954f7e0ae2afb (patch) | |
| tree | b1f12bce35d5281a3a3d47e3cdcbd75d4c498810 /index.html | |
| parent | 67dd4bdd47a0324507bed232d22068aa198549fe (diff) | |
| parent | 688e22dc367f37d4b8734a37daa3b823ea450295 (diff) | |
| download | ninja-325cf1dcbd7fc1e1ec6a9ac4829954f7e0ae2afb.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja into GridFixes
Conflicts:
assets/shaders/radialBlur.frag.glsl
Diffstat (limited to 'index.html')
| -rwxr-xr-x | index.html | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -34,7 +34,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 34 | 34 | ||
| 35 | <head lang="en"> | 35 | <head lang="en"> |
| 36 | 36 | ||
| 37 | <title>Motorola Ninja</title> | 37 | <title>Ninja</title> |
| 38 | 38 | ||
| 39 | <meta charset="utf-8"/> | 39 | <meta charset="utf-8"/> |
| 40 | <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/> | 40 | <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/> |