[cvs] commit: ansel/lib/GalleryMode Date.php ansel/templates/view gallery.inc gallerylightbox.inc results.inc

[Michael Rubinsky]

mrubinsk    2008-10-17 13:57:19 EDT

  Modified files:        (Branch: FRAMEWORK_3)
    lib/GalleryMode      Date.php 
    templates/view       gallery.inc gallerylightbox.inc 
                         results.inc 
  Log:
  yet more botched/missed merges
  
  Revision   Changes    Path
  1.5.2.5    +3 -2      ansel/lib/GalleryMode/Date.php
  1.173.2.4  +1 -17     ansel/templates/view/gallery.inc
  1.22.2.8   +1 -17     ansel/templates/view/gallerylightbox.inc
  1.29.2.1   +0 -16     ansel/templates/view/results.inc

  Chora Links:
  http://cvs.horde.org/diff.php/ansel/lib/GalleryMode/Date.php?r1=1.5.2.4&r2=1.5.2.5&ty=u
  http://cvs.horde.org/diff.php/ansel/templates/view/gallery.inc?r1=1.173.2.3&r2=1.173.2.4&ty=u
  http://cvs.horde.org/diff.php/ansel/templates/view/gallerylightbox.inc?r1=1.22.2.7&r2=1.22.2.8&ty=u
  http://cvs.horde.org/diff.php/ansel/templates/view/results.inc?r1=1.29&r2=1.29.2.1&ty=u