Merge master.
authorCarl Hetherington <cth@carlh.net>
Sun, 4 Nov 2012 14:52:43 +0000 (14:52 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 4 Nov 2012 14:52:43 +0000 (14:52 +0000)
commitd9f9938c2ca2a1f9b27a85bf64a50d7f480f969b
tree5a3c0abf1813983324e57c896deff490055d311e
parentb4dd5979b6c1d48b0af4fefd9d1df4e9947da402
parentc366d41af080b9ac37117a9b27a249722c77f74e
Merge master.
src/lib/decoder.cc
src/lib/film.cc
src/lib/options.h
src/lib/tiff_decoder.cc