[cvs] commit: dimp/js DimpBase.js dimp/js/src DimpBase.js dimp/lib/Views ListMessages.php dimp/templates/index index.inc

[Michael M Slusarz]

slusarz     2008-05-28 16:41:10 EDT

  Modified files:        (Branch: FRAMEWORK_3)
    js                   DimpBase.js 
    js/src               DimpBase.js 
    lib/Views            ListMessages.php 
    templates/index      index.inc 
  Log:
  Fix a few merges that disappeared between HEAD and FW_3.
  
  Revision    Changes    Path
  1.1.2.48    +1 -1      dimp/js/DimpBase.js
  1.1.2.48    +1 -4      dimp/js/src/DimpBase.js
  1.53.2.13   +9 -16     dimp/lib/Views/ListMessages.php
  1.152.2.38  +2 -2      dimp/templates/index/index.inc

  Chora Links:
  http://cvs.horde.org/diff.php/dimp/js/DimpBase.js?r1=1.1.2.47&r2=1.1.2.48&ty=u
  http://cvs.horde.org/diff.php/dimp/js/src/DimpBase.js?r1=1.1.2.47&r2=1.1.2.48&ty=u
  http://cvs.horde.org/diff.php/dimp/lib/Views/ListMessages.php?r1=1.53.2.12&r2=1.53.2.13&ty=u
  http://cvs.horde.org/diff.php/dimp/templates/index/index.inc?r1=1.152.2.37&r2=1.152.2.38&ty=u