Revision 4f82f078
ID | 4f82f078b8093257edda8087727f010c8b2606ca |
Parent | 1aa3052d, fa94ac90 |
Child | 7a6b9fc9 |
Merge branch 'bug-295' into one-2.0
Conflicts:
include/Image.h
src/image/Image.cc
Files
- added
- modified
- copied
- renamed
- deleted
ID | 4f82f078b8093257edda8087727f010c8b2606ca |
Parent | 1aa3052d, fa94ac90 |
Child | 7a6b9fc9 |
Added by Ruben S. Montero almost 11 years ago
Merge branch 'bug-295' into one-2.0
Conflicts:
include/Image.h
src/image/Image.cc