From: Alan Knowles <alan@akbkhome.com>
Date: Tue, 29 Jun 2010 06:36:22 +0000 (+0800)
Subject: JSDOC/Options.js
X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=commitdiff_plain;h=752300965e2b54c7dfed19371eb0ba0d066eafee

JSDOC/Options.js
---

diff --git a/JSDOC/Options.js b/JSDOC/Options.js
index dc031f1..63a5dcd 100644
--- a/JSDOC/Options.js
+++ b/JSDOC/Options.js
@@ -3,7 +3,8 @@
  * Options management...
  */
 XObject = import.XObject.XObject;
-XObject = import.File.File;
+File = import.File.File;
+
 Options = {
     
     "files" : [],  // was _
@@ -41,7 +42,7 @@ Options = {
     {
         Log.verbose = this.verbose;
         if (Options.conf) {
-            
+            XObject.extend(this, JSON.parse(File.read(Options.conf)));;
         }
     }
 }
\ No newline at end of file