diff options
| author | Valerio Virgillito | 2012-02-13 21:43:51 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-13 21:43:51 -0800 |
| commit | 081f17954c735fc8b946d72a25b0ee60d370ef9b (patch) | |
| tree | de7b50f2d02365df897ef4356f953d3833c9cabd /license.html | |
| parent | 47df0aff81c25334b129047bb227ea5015357eda (diff) | |
| parent | 1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (diff) | |
| download | ninja-081f17954c735fc8b946d72a25b0ee60d370ef9b.tar.gz | |
Merge branch 'refs/heads/master' into components
Conflicts:
js/components/treeview/ninja-leaf.reel/ninja-leaf.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'license.html')
| -rw-r--r-- | license.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/license.html b/license.html index d8fcc975..d86c6cd4 100644 --- a/license.html +++ b/license.html | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | <html> | 7 | <html> |
| 8 | 8 | ||
| 9 | <head lang="en"> | 9 | <head lang="en"> |
| 10 | <title>Motorola Ninja - BSD License</title> | 10 | <title>Ninja License</title> |
| 11 | 11 | ||
| 12 | <meta charset="utf-8"/> | 12 | <meta charset="utf-8"/> |
| 13 | <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/> | 13 | <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/> |