Commit fc651e5e authored by Dennis Real's avatar Dennis Real
Browse files

Merge remote branch 'upstream/master' 

Conflicts:
	src/exif.c
parents 458c5cfd 54deb9b8
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment