Date.js

[gnome.introspection-doc-generator] / Date.js

diff --git a/Date.js b/Date.js
index 47fb4f1..0876355 100755 (executable)
--- a/Date.js
+++ b/Date.js
@@ -8,7 +8,11 @@
  * Fork - LGPL
  * <script type="text/javascript">
  */
+<<<<<<< HEAD
 // usage: Date=  imports.Date.Date;
+=======
+// usage: Seed.include('Date.js')
+>>>>>>> 134619d3049edce9b27810483e8011e5dfb783e0
 
 
 String          = imports.String.String;
@@ -112,7 +116,7 @@ document.write(dt.format(Date.patterns.ShortDate));
      @return {Number} The diff in milliseconds
      @member Date getElapsed
      */
-XObject.extend(Date,
+Date = XObject.extend(Date,
     {
         
         // private
@@ -330,7 +334,9 @@ XObject.extend(Date,
             return Date[func](input);
         },
 
-        // private
+        /**
+        * @private
+        */
         createParser : function(format) {
             var funcName = "parse" + Date.parseFunctions.count++;
             var regexNum = Date.parseRegexes.length;