summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDennis Real <github@tildepipe.org>2012-02-26 19:08:22 +0100
committerDennis Real <github@tildepipe.org>2012-02-26 19:08:22 +0100
commitfc651e5eb5a7cce4f2df97eb8aee3d9ad34f9717 (patch)
treed920a9d3c789dc9856871fdc24e73990426075dd /Makefile
parent458c5cfd464c84048c7e9027f6ef803d261742e3 (diff)
parent54deb9b8e21354a1670c179a7d8bd09e4e391026 (diff)
Merge remote branch 'upstream/master'
Conflicts: src/exif.c
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions