[cvs] commit: ansel/lib/Views Gallery.php Image.php List.php

[Michael Rubinsky]

mrubinsk    2009-06-16 06:10:52 EDT

  Modified files:        (Branch: FRAMEWORK_3)
    lib/Views            Gallery.php Image.php List.php 
  Log:
  Fix more broken merges.
  
  Revision   Changes    Path
  1.119.2.7  +2 -3      ansel/lib/Views/Gallery.php
  1.68.2.12  +5 -4      ansel/lib/Views/Image.php
  1.33.2.4   +6 -1      ansel/lib/Views/List.php

  Chora Links:
  http://cvs.horde.org/diff.php/ansel/lib/Views/Gallery.php?rt=horde&r1=1.119.2.6&r2=1.119.2.7&ty=u
  http://cvs.horde.org/diff.php/ansel/lib/Views/Image.php?rt=horde&r1=1.68.2.11&r2=1.68.2.12&ty=u
  http://cvs.horde.org/diff.php/ansel/lib/Views/List.php?rt=horde&r1=1.33.2.3&r2=1.33.2.4&ty=u