| author | Rekhesh Mohan <reks@iiap.res.in> | |
| Thu, 8 Nov 2012 08:10:53 +0000 (13:40 +0530) | ||
| committer | Rekhesh Mohan <reks@iiap.res.in> | |
| Thu, 8 Nov 2012 08:10:53 +0000 (13:40 +0530) | ||
| commit | ca5520b0c818f4ad57e2e57d557fc999f9dfe3c7 | |
| tree | b8ed246677cf36fd083bb0579d908a0223198acc | tree | snapshot |
| parent | 43cf6bddbf02b21c68b405e267605b1b64cddd8d | commit | diff |
| parent | bac717c6c0665b5754079fdcf79a79c797e6b62e | commit | diff |
Merge branch 'testing' now v2.1
Conflicts:
ChangeLog.txt
configure.ac
src/filesys.c
src/fits2jpeg.c
src/image.c
Conflicts:
ChangeLog.txt
configure.ac
src/filesys.c
src/fits2jpeg.c
src/image.c
| ChangeLog.txt | diff1 | | diff2 | | blob | history |
| src/filesys.c | diff1 | | diff2 | | blob | history |
| src/image.c | diff1 | | diff2 | | blob | history |