[pkg-horde] [SCM] Debian Horde Packages repository: gollem package branch, upstream+patches, updated. 83371fdc410d14a4a22309b11f7aed034fd10b7d

[Gregory Colpart]

The following commit has been merged in the upstream+patches branch:
commit 83371fdc410d14a4a22309b11f7aed034fd10b7d
Merge: 43eac8b359ecb70af5fd6c37ec9f5d25241abadd 856c4e03a9387bc8cef7081797b67156469e6c8c
Author: Gregory Colpart <gcolpart at ioakim2.evolix.net>
Date:   Tue Aug 3 02:17:16 2010 +0200

    Merge branch 'upstream' into upstream+patches

diff --combined config/prefs.php.dist
index 416690c,bdd865b..7a2ebb8
--- a/config/prefs.php.dist
+++ b/config/prefs.php.dist
@@@ -1,13 -1,12 +1,13 @@@
  <?php
  /**
-  * $Horde: gollem/config/prefs.php.dist,v 1.32.2.1 2008/10/09 20:54:40 jan Exp $
+  * $Horde: gollem/config/prefs.php.dist,v 1.32.2.1 2008-10-09 20:54:40 jan Exp $
   *
   * See horde/config/prefs.php for documentation on the structure of this file.
   */
  
  // Make sure that constants are defined.
 -require_once dirname(__FILE__) . '/../lib/Gollem.php';
 + at define('GOLLEM_BASE', dirname(__FILE__) . '/..');
 +require_once GOLLEM_BASE . '/lib/Gollem.php';
  
  $prefGroups['display'] = array(
      'column' => _("User Interface"),

-- 
Debian Horde Packages repository: gollem package