John Cupitt
|
b948f17c02
|
Merge remote-tracking branch 'origin/7.26'
Conflicts:
ChangeLog
configure.in
libvips/include/vips/vips.h
libvips/include/vips/vips7compat.h
libvips/iofuncs/image.c
libvips/iofuncs/init.c
po/vips7.pot
|
2011-10-11 21:49:06 +01:00 |
|
John Cupitt
|
5e6251ac1d
|
sync
|
2011-10-11 21:21:12 +01:00 |
|
John Cupitt
|
7111ff2433
|
version bump for next cycle
s Please enter the commit message for your changes. Lines starting
|
2011-08-21 18:06:19 +01:00 |
|
John Cupitt
|
0b39b4d9c8
|
better compiling without c++
closer to a painless no-c++ build, though not quite there yet
|
2011-08-16 15:37:50 +01:00 |
|
John Cupitt
|
b748961743
|
im_benchmark.c had some debugging left in
oops, im_benchmark.c had some work commenetd out, hence the fast run
times
|
2011-08-10 10:17:36 +01:00 |
|
John Cupitt
|
cf4c5979eb
|
more win32 fixes
|
2011-07-26 18:44:52 +01:00 |
|
John Cupitt
|
eda7a9d9d7
|
fixes to get win32 building
|
2011-07-26 16:40:26 +01:00 |