aboutsummaryrefslogtreecommitdiff
path: root/license.html
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-24 12:08:49 -0800
committerPushkar Joshi2012-02-24 12:08:49 -0800
commit03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
treec51112223ceb9121cd595a60335eb2795215590f /license.html
parentfcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
downloadninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz
Merge branch 'pentool' into brushtool
Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
Diffstat (limited to 'license.html')
-rw-r--r--license.html2
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"/>