test file with some exif data added
Merge remote branch 'upstream/master'
test case adapted to new testfile
test file with some exif data added
test case adapted to new testfile
Merge branch 'master' of ssh://github.com/reald/feh
Merge branch 'master' of git://github.com/derf/feh
Merge branch 'master' of git://github.com/derf/feh
Merge branch 'master' of git://github.com/derf/feh
Merge branch 'master' of git://github.com/derf/feh
- exif handling changed
- gps info added if available
Merge remote branch 'upstream/master'
1. Own module for nikon maker notes
2. Support for AFInfo2
Nikon makernote parts changed
Merge remote branch 'upstream/master'
Support for Active D-Lightning
Support for Canon Exif makernote tags
Merge branch 'master' of git://github.com/derf/feh
Merge branch 'master' of git://github.com/derf/feh
Merge branch 'master' of git://github.com/derf/feh