« Previous | Next » 

Revision 4f82f078

ID4f82f078b8093257edda8087727f010c8b2606ca
Parent 1aa3052d, fa94ac90
Child 7a6b9fc9

Added by Ruben S. Montero over 10 years ago

Merge branch 'bug-295' into one-2.0

Conflicts:
include/Image.h
src/image/Image.cc

Files

  • added
  • modified
  • copied
  • renamed
  • deleted