From: www-data <www-data@newweb2.(none)>
Date: Sat, 3 Nov 2012 04:59:51 +0000 (+0800)
Subject: Merge branch 'master' of /home/git/private/web.mtrack
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=8577310cff6b285caffeafb6820f91b25449bf27;hp=e4a6f313b105751743828686cb0cce1a322b0a4e;p=web.mtrack

Merge branch 'master' of /home/git/private/web.mtrack
---

diff --git a/index.php b/index.php
index 9000883b..cf0715d4 100644
--- a/index.php
+++ b/index.php
@@ -20,7 +20,6 @@ new HTML_FlexyFramework(array(
     'enable' => 'MTrack,Core,Admin', // enable permissions from Pman 
     'database'        => 'mysql://root:@localhost/pman',
     'version' => '2.0',
-    
     'DB_DataObject' => array(
        //  'debug' => 5,
 
@@ -31,11 +30,11 @@ new HTML_FlexyFramework(array(
         )),
         'class_prefix' => 'Pman_MTrack_DataObjects_:Pman_Core_DataObjects_:',
         
-        'ini_mtrack' => implode(PATH_SEPARATOR, array(
-                dirname(__FILE__). '/Pman/MTrack/DataObjects/pman.ini',
-                dirname(__FILE__). '/Pman/Core/DataObjects/pman.ini',
-                
-        )),
+        //'ini_mtrack' => implode(PATH_SEPARATOR, array(
+        //        dirname(__FILE__). '/Pman/MTrack/DataObjects/pman.ini',
+        //        dirname(__FILE__). '/Pman/Core/DataObjects/pman.ini',
+        //        
+        //)),
     ),
     'MTrackWeb' => array(
         'working_dir' => '/var/lib/mtrack', // this needs to be writable by web user..
@@ -52,7 +51,7 @@ new HTML_FlexyFramework(array(
          'useroo' => true,
     ),
      'Pman_Core' => array(
-        'jspacker' => '/home/alan/gitlive/gnome.introspection-doc-generator',
+        'jspacker' => '/home/gitlive/gnome.introspection-doc-generator',
         'cssminify' => dirname(__FILE__).'/roojs1/buildSDK/cssminify.js',
     )
 ));