diff options
| author | Dennis Real <github@tildepipe.org> | 2012-02-26 19:08:22 +0100 |
|---|---|---|
| committer | Dennis Real <github@tildepipe.org> | 2012-02-26 19:08:22 +0100 |
| commit | fc651e5eb5a7cce4f2df97eb8aee3d9ad34f9717 (patch) | |
| tree | d920a9d3c789dc9856871fdc24e73990426075dd /.gitignore | |
| parent | 458c5cfd464c84048c7e9027f6ef803d261742e3 (diff) | |
| parent | 54deb9b8e21354a1670c179a7d8bd09e4e391026 (diff) | |
Merge remote branch 'upstream/master'
Conflicts:
src/exif.c
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions