[cvs] commit: dimp imp.php index.php dimp/lib base.php

[Michael M Slusarz]

slusarz     2006-09-04 00:18:34 PDT

  Modified files:
    .                    imp.php index.php 
    lib                  base.php 
  Log:
  Correctly merge dimp configuration information into current config array.
  
  Revision  Changes    Path
  1.95      +1 -2      dimp/imp.php
  1.30      +1 -2      dimp/index.php
  1.14      +3 -2      dimp/lib/base.php

  Chora Links:
  http://cvs.horde.org/diff.php/dimp/imp.php?r1=1.94&r2=1.95&ty=u
  http://cvs.horde.org/diff.php/dimp/index.php?r1=1.29&r2=1.30&ty=u
  http://cvs.horde.org/diff.php/dimp/lib/base.php?r1=1.13&r2=1.14&ty=u