Resolve exiv2 merge conflicts and merge with

Browse Source

...

This commit is contained in:

Thanatomanic

2020-10-16 11:45:26 +02:00

parent e093555c66 28f0bc14da

commit 8b4389ade9

49 changed files with 1531 additions and 17588 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1536

rtengine/imagedata.cc

File diff suppressed because it is too large Load Diff