Merge branch 'master' into 16-keyboard

Conflicts: pointstream.js
aSydiK · Jul 9, 2010 · b1aac3b · b1aac3b
2 parents aa868c1 + a5c5790
commit b1aac3b
Show file tree

Hide file tree

Showing 5 changed files with 156,877 additions and 156,983 deletions.
diff --git a/demos/acorn/acorn.html b/demos/acorn/acorn.html
@@ -2,7 +2,6 @@
 
   <head>
     <link rel="stylesheet" type="text/css" href="../style.css" />
-    <script src="../../mjs.js"></script>
     <script src="../../pointstream.js"></script>
     <script src="acorn.js"></script>
   </head>