Skip to content
GitLab
Explore
Sign in
Commit
fc651e5e
authored
Feb 26, 2012
by
Dennis Real
Browse files
Merge remote branch 'upstream/master'
Conflicts: src/exif.c
parents
458c5cfd
54deb9b8
Loading
Loading
Loading
Changes
6
Hide whitespace changes
Inline
Side-by-side
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment