[cvs] commit: kronolith delete.php kronolith/lib api.php kronolith/lib/Driver holidays.php sql.php kronolith/templates/delete one.inc kronolith/templates/edit edit.inc

[Gunnar Wrobel]

wrobel      2008-03-07 02:32:58 EST

  Modified files:        (Branch: FRAMEWORK_3)
    .                    delete.php 
    lib                  api.php 
    lib/Driver           holidays.php sql.php 
    templates/delete     one.inc 
    templates/edit       edit.inc 
  Log:
  Merge from HEAD.
  
  Revision    Changes    Path
  1.9.2.4     +2 -2      kronolith/delete.php
  1.6.2.2     +1 -1      kronolith/lib/Driver/holidays.php
  1.136.2.31  +2 -2      kronolith/lib/Driver/sql.php
  1.126.2.35  +2 -2      kronolith/lib/api.php
  1.10.12.6   +1 -1      kronolith/templates/delete/one.inc
  1.111.4.14  +1 -1      kronolith/templates/edit/edit.inc

  Chora Links:
  http://cvs.horde.org/diff.php/kronolith/delete.php?r1=1.9.2.3&r2=1.9.2.4&ty=u
  http://cvs.horde.org/diff.php/kronolith/lib/Driver/holidays.php?r1=1.6.2.1&r2=1.6.2.2&ty=u
  http://cvs.horde.org/diff.php/kronolith/lib/Driver/sql.php?r1=1.136.2.30&r2=1.136.2.31&ty=u
  http://cvs.horde.org/diff.php/kronolith/lib/api.php?r1=1.126.2.34&r2=1.126.2.35&ty=u
  http://cvs.horde.org/diff.php/kronolith/templates/delete/one.inc?r1=1.10.12.5&r2=1.10.12.6&ty=u
  http://cvs.horde.org/diff.php/kronolith/templates/edit/edit.inc?r1=1.111.4.13&r2=1.111.4.14&ty=u