From: Alan Knowles <alan@akbkhome.com>
Date: Fri, 23 Jul 2010 04:39:55 +0000 (+0800)
Subject: Date.js
X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=commitdiff_plain;h=584f17e8519442d0932166895f7cc95302674205;hp=17c4d6a264de12b91425dae49fc56abcf103e519

Date.js
---

diff --git a/Date.js b/Date.js
index 052015f..0876355 100755
--- 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;
diff --git a/String.js b/String.js
index 5196351..122a008 100755
--- a/String.js
+++ b/String.js
@@ -9,10 +9,18 @@
  * <script type="text/javascript">
  */
 // usage:
+<<<<<<< HEAD
 //String = imports.String.String; 
 XObject = imports.XObject.XObject;
 
 String = XObject.extend(String, 
+=======
+// Seed.include('String.js');
+XObject = imports.XObject.XObject;
+
+
+XObject.extend(String, 
+>>>>>>> 134619d3049edce9b27810483e8011e5dfb783e0
     {
     
         /** @scope String */
diff --git a/templates/resources/default.css b/templates/resources/default.css
old mode 100755
new mode 100644
diff --git a/templates/resources/library_gnome.css b/templates/resources/library_gnome.css
old mode 100755
new mode 100644
diff --git a/templates/resources/library_gnome_print.css b/templates/resources/library_gnome_print.css
old mode 100755
new mode 100644
diff --git a/templates/resources/page.js b/templates/resources/page.js
old mode 100755
new mode 100644
diff --git a/templates/seed/class_ix.html b/templates/seed/class_ix.html
old mode 100755
new mode 100644