Merged master. Fixed merge error with Date toISOString, having moved …

…from one file to another.
280north · Dec 14, 2009 · 9745db5 · 9745db5
2 parents 552d666 + 01b9b00
commit 9745db5
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1 deletion.
diff --git a/README.md b/README.md
diff --git a/engines/default/lib/global-es5.js b/engines/default/lib/global-es5.js
@@ -368,7 +368,7 @@ if (!Date.prototype.toISOString) {
     Date.prototype.toISOString = function() {
         return (
             this.getFullYear() + "-" +
-            this.getMonth() + "-" +
+            (this.getMonth() + 1) + "-" +
             this.getDate() + "T" +
             this.getHours() + ":" +
             this.getMinutes() + ":" +

diff --git a/engines/rhino/jars/js.jar b/engines/rhino/jars/js.jar